From 120171b9adc45f804df8fa4930aaadd1575d67c8 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Sat, 22 Dec 2018 16:07:00 +0600
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=AF=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E5=8F=AF=E7=BC=96=E8=BE=91=EF=BC=8C=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=90=8E=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=8F=AF=E9=87=8D=E6=96=B0=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=B8=8B=E5=8F=91=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=AE=A1=E6=A0=B8=E7=9A=84=E9=85=8D=E7=BD=AE=E4=B9=9F?=
 =?UTF-8?q?=E5=8F=AF=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=BF=97=E9=87=8F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/service/BaseService.java | 8 ++++++--
 src/main/webapp/WEB-INF/tags/sys/delRow.tag        | 4 ++--
 src/main/webapp/static/global/scripts/pzLog.js     | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

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("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
 			return;
 		}else if(cked.val()==3){
-			top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
-			return;
+			/* top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
+			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<data.serviceIds.length;i++){
 						if(data.serviceIds[i]==$(this).attr("serviceId")){