gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消审核的配置可显示，并且可编辑，编辑后状态变更为未审核，可重新审核下发，并且取消审核的配置也可查询日志量信息。

Browse Source
This commit is contained in:
zhangwei
2018-12-22 16:07:00 +06:00
parent fb5c819025
commit 120171b9ad
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -205,7 +205,8 @@ public abstract class BaseService {
} else { } else {
// 如果包含全部权限，则去掉之前添加的所有条件但增加配置审核取消以及删除的配置，并跳出循环。 // 如果包含全部权限，则去掉之前添加的所有条件但增加配置审核取消以及删除的配置，并跳出循环。
sqlString = new StringBuilder(); sqlString = new StringBuilder();
sqlString.append(" OR " + configAlias + ".is_audit !=3"); // sqlString.append(" OR " + configAlias + ".is_audit !=3");
sqlString.append(" OR " + configAlias + ".creator_id <> 1");
} }
} }
if (StringUtils.isNotBlank(sqlString.toString())) { if (StringUtils.isNotBlank(sqlString.toString())) {
@@ -272,11 +273,14 @@ public abstract class BaseService {
+ ".type>1)"); + ".type>1)");
} else if (SysRole.DATA_SCOPE_CREATOR.equals(dataScope)) { } else if (SysRole.DATA_SCOPE_CREATOR.equals(dataScope)) {
scopeSql.append(" OR " + configAlias + ".is_audit !=3"); // scopeSql.append(" OR " + configAlias + ".is_audit !=3");
scopeSql.append(" OR " + configAlias + ".creator_id <>1 ");
} else if (SysRole.DATA_SCOPE_AUDITOR.equals(dataScope)) { } else if (SysRole.DATA_SCOPE_AUDITOR.equals(dataScope)) {
scopeSql.append(" OR " + configAlias + ".is_audit = 0 or " + configAlias + ".is_audit = 1"); scopeSql.append(" OR " + configAlias + ".is_audit = 0 or " + configAlias + ".is_audit = 1");
scopeSql.append(" OR " + configAlias + ".creator_id <>1 ");
} else if (SysRole.DATA_SCOPE_SHOWER.equals(dataScope)) { } else if (SysRole.DATA_SCOPE_SHOWER.equals(dataScope)) {
scopeSql.append(" OR " + configAlias + ".is_audit = 1"); scopeSql.append(" OR " + configAlias + ".is_audit = 1");
scopeSql.append(" OR " + configAlias + ".creator_id <>1 ");
} }
return scopeSql.toString(); return scopeSql.toString();

4
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -114,8 +114,8 @@ function update(url){
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return; return;
}else if(cked.val()==3){ }else if(cked.val()==3){
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>"); /* top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return; return; */
} }
//处理asnIp,asn组下发过的ip配置不允许修改 //处理asnIp,asn组下发过的ip配置不允许修改
if(cked.attr("serviceGroupId")&&cked.attr("isValid")){ if(cked.attr("serviceGroupId")&&cked.attr("isValid")){

2
src/main/webapp/static/global/scripts/pzLog.js
View File

@@ -20,7 +20,7 @@ var getTotalLog=function(){
var serviceId=$(this).attr("serviceId"); var serviceId=$(this).attr("serviceId");
var functionId=$(this).attr("functionId"); var functionId=$(this).attr("functionId");
if(audit&&compileId&&functionId&&serviceId){ if(audit&&compileId&&functionId&&serviceId){
if(audit == 1){ if(audit != 0){
var has=false; var has=false;
for(var i=0;i<data.serviceIds.length;i++){ for(var i=0;i<data.serviceIds.length;i++){
if(data.serviceIds[i]==$(this).attr("serviceId")){ if(data.serviceIds[i]==$(this).attr("serviceId")){