8小时后台--

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

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

@@ -763,12 +763,18 @@ public class SpmkController {
 
 		/*判断是否有权限转派*/
 		if(approvingDto.getUser()!=null){
-			ZzglAuth zzglAuth = ZzglAuth.builder().build().selectOne(new QueryWrapper<ZzglAuth>().lambda().eq(ZzglAuth::getBmgwId,userBean.getUserInfo().getBmgwId())
-					.eq(ZzglAuth::getMenuId,"/Approvalcustomshenpi020101"));
-			if(zzglAuth==null){
+			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) {
 						return ResultUtil.error("您没有转派审批人的权限");
 					}
 				}
+			}
+		}
 		Integer asId = approvingDto.getAsId();
 		//查询redis中当前有没有在被审批执行中，0是没有在执行，1是在执行
 		Integer approStatus=Integer.parseInt(redisUtil.get(asId.toString())==null?"0":redisUtil.get(asId.toString()).toString());