验收优化

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceCheckController.java

@@ -214,27 +214,27 @@ public class AcceptanceCheckController extends BaseController {
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			roleIds.addAll(longs);
-			if (longs.contains(areaId)) {
-				basicGridNodes.add("bw-area");
-			}
-			if (longs.contains(engineeringId)) {
-				basicGridNodes.add("bw-engineering");
-			}
-			if (longs.contains(designId)) {
-				basicGridNodes.add("bw-design");
-			}
-			if (longs.contains(delerAdminId)) {
-				basicGridNodes.add("bw-design");
-				basicGridNodes.add("bw-engineering");
-				basicGridNodes.add("bw-area");
-			}
+//			if (longs.contains(areaId)) {
+//				basicGridNodes.add("bw-area");
+//			}
+//			if (longs.contains(engineeringId)) {
+//				basicGridNodes.add("bw-engineering");
+//			}
+//			if (longs.contains(designId)) {
+//				basicGridNodes.add("bw-design");
+//			}
+//			if (longs.contains(delerAdminId)) {
+//				basicGridNodes.add("bw-design");
+//				basicGridNodes.add("bw-engineering");
+//				basicGridNodes.add("bw-area");
+//			}
 		}
 		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "",basicGridNodes,type);
 		//根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null){
 			for (AcceptanceCheckDto e : page.getRecords()) {
 				for (String g : basicGridNodes) {
-					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId))){
+					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) ){ //&& (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId))
 						e.setIsAudit("0");
 						break;
 					}else {