8小时后台--

设置超管和管理员不受权限控制

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -530,17 +530,24 @@ public class SpmkController {
 		Router router = spmkApproveSummaryDto.getRouter();
 		Router router = spmkApproveSummaryDto.getRouter();
 //			routers = RouterUtils.clearRouters(routers);
 //			routers = RouterUtils.clearRouters(routers);
 		/*TODO 验证是否拥有添加审核人的权限 只用于华颐*/
 		/*TODO 验证是否拥有添加审核人的权限 只用于华颐*/
-		ZzglAuth zzglAuth = ZzglAuth.builder().build().selectOne(new QueryWrapper<ZzglAuth>().lambda().eq(ZzglAuth::getBmgwId,userBean.getUserInfo().getBmgwId())
-		.eq(ZzglAuth::getMenuId,"/Approvalcustomshenpi020101"));
-		/*如果没有该权限*/
-		if(zzglAuth==null){
-			SpmkCustomApproval ca = SpmkCustomApproval.builder().build().selectOne(new QueryWrapper<SpmkCustomApproval>().lambda()
-					.eq(SpmkCustomApproval::getName,spmkApproveSummaryDto.getApproveName()).eq(SpmkCustomApproval::getOrgCode,userBean.getOrgCode()));
-			Router	oldRouter=ObjectUtil.deserialize(ca.getRouter());
-			if(isTrue(router.getChildren(),oldRouter.getChildren())){
-				return ResultUtil.error("你没有设置审批人的权限");
+		QyzxEmpEntAsso ent = QyzxEmpEntAsso.builder().build().selectOne(new QueryWrapper<QyzxEmpEntAsso>().lambda().eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode()).eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum()));
+		if(ent != null) {
+			/*超管和管理员不受权限控制*/
+			if(ent.getUserType() == 2) {
+				ZzglAuth zzglAuth = ZzglAuth.builder().build().selectOne(new QueryWrapper<ZzglAuth>().lambda().eq(ZzglAuth::getBmgwId,userBean.getUserInfo().getBmgwId())
+						.eq(ZzglAuth::getMenuId,"/Approvalcustomshenpi020101"));
+				/*如果没有该权限*/
+				if(zzglAuth==null){
+					SpmkCustomApproval ca = SpmkCustomApproval.builder().build().selectOne(new QueryWrapper<SpmkCustomApproval>().lambda()
+							.eq(SpmkCustomApproval::getName,spmkApproveSummaryDto.getApproveName()).eq(SpmkCustomApproval::getOrgCode,userBean.getOrgCode()));
+					Router	oldRouter=ObjectUtil.deserialize(ca.getRouter());
+					if(isTrue(router.getChildren(),oldRouter.getChildren())){
+						return ResultUtil.error("您没有设置审批人的权限");
+					}
+				}
 			}
 			}
 		}
 		}
+
 		List<Router> routers = router.getChildren();
 		List<Router> routers = router.getChildren();
 		if(routers==null){
 		if(routers==null){
 			return ResultUtil.error("无法发起，请完善审批流程");
 			return ResultUtil.error("无法发起，请完善审批流程");
@@ -757,7 +764,7 @@ public class SpmkController {
 		/*ZzglAuth zzglAuth = ZzglAuth.builder().build().selectOne(new QueryWrapper<ZzglAuth>().lambda().eq(ZzglAuth::getBmgwId,userBean.getUserInfo().getBmgwId())
 		/*ZzglAuth zzglAuth = ZzglAuth.builder().build().selectOne(new QueryWrapper<ZzglAuth>().lambda().eq(ZzglAuth::getBmgwId,userBean.getUserInfo().getBmgwId())
 				.eq(ZzglAuth::getMenuId,"/Approvalcustomshenpi020101"));
 				.eq(ZzglAuth::getMenuId,"/Approvalcustomshenpi020101"));
 		if(zzglAuth==null){
 		if(zzglAuth==null){
-			return ResultUtil.error("你没有转派审批人的权限");
+			return ResultUtil.error("您没有转派审批人的权限");
 		}*/
 		}*/
 
 
 		Integer asId = approvingDto.getAsId();
 		Integer asId = approvingDto.getAsId();