diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 66e166d1f..e3fdc73d2 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -205,7 +205,8 @@ public abstract class BaseService {
} else {
// 如果包含全部权限,则去掉之前添加的所有条件但增加配置审核取消以及删除的配置,并跳出循环。
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())) {
@@ -272,11 +273,14 @@ public abstract class BaseService {
+ ".type>1)");
} 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)) {
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)) {
scopeSql.append(" OR " + configAlias + ".is_audit = 1");
+ scopeSql.append(" OR " + configAlias + ".creator_id <>1 ");
}
return scopeSql.toString();
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index b4ec2e83d..07b1ff26e 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -114,8 +114,8 @@ function update(url){
top.$.jBox.tip("", "");
return;
}else if(cked.val()==3){
- top.$.jBox.tip("", "");
- return;
+ /* top.$.jBox.tip("", "");
+ return; */
}
//处理asnIp,asn组下发过的ip配置不允许修改
if(cked.attr("serviceGroupId")&&cked.attr("isValid")){
diff --git a/src/main/webapp/static/global/scripts/pzLog.js b/src/main/webapp/static/global/scripts/pzLog.js
index 33dcc0f2d..562910aa3 100644
--- a/src/main/webapp/static/global/scripts/pzLog.js
+++ b/src/main/webapp/static/global/scripts/pzLog.js
@@ -20,7 +20,7 @@ var getTotalLog=function(){
var serviceId=$(this).attr("serviceId");
var functionId=$(this).attr("functionId");
if(audit&&compileId&&functionId&&serviceId){
- if(audit == 1){
+ if(audit != 0){
var has=false;
for(var i=0;i