ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 判断管理员角色使用loginUser的isAdmin

Browse Source
This commit is contained in:
lijiarao
2024-02-04 09:55:01 +08:00
parent c8bef50d41
commit 43881b113c
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+2 -3
View File
@@ -298,10 +298,9 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
.map(ProcessApprovalRecord::getUserId) .map(ProcessApprovalRecord::getUserId)
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
String loginUserId = CurrentUserUtil.getId(); LoginUser loginUser = CurrentUserUtil.getLoginUser();
String roleIds = CurrentUserUtil.getRoles();
//管理员和当前流程中人员可以催办 //管理员和当前流程中人员可以催办
if (!roleIds.contains(FieldCommon.ROLE_ADMIN) && !canUrgingUserList.contains(loginUserId)){ if (!loginUser.getIsAdmin() && !canUrgingUserList.contains(loginUser.getId())){
throw new JeroBootException(ResultCommon.TASK_URGING_ERROR_2); throw new JeroBootException(ResultCommon.TASK_URGING_ERROR_2);
} }
laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsEvaluationNotMetController.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class LawsEvaluationNotMetController extends JeroController<LawsEvaluatio
List<LawsEvaluationNotMet> notMets = lawsEvaluationNotMetService.listByIds(ids); List<LawsEvaluationNotMet> notMets = lawsEvaluationNotMetService.listByIds(ids);
for (LawsEvaluationNotMet notMet : notMets) { for (LawsEvaluationNotMet notMet : notMets) {
//管理员和设计工程师可以操作未符合项 //管理员和设计工程师可以操作未符合项
if (!roleIds.contains(FieldCommon.ROLE_ADMIN) && !userId.equals(notMet.getEngineerId())){ if (!loginUser.getIsAdmin() && !userId.equals(notMet.getEngineerId())){
throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT); throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT);
} }
String state = notMet.getState(); String state = notMet.getState();
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl<LawsEvaluationN
String roleIds = loginUser.getRoleIds(); String roleIds = loginUser.getRoleIds();
String userId = loginUser.getId(); String userId = loginUser.getId();
//管理员和设计工程师可以操作未符合项 //管理员和设计工程师可以操作未符合项
if (!roleIds.contains(FieldCommon.ROLE_ADMIN) && !userId.equals(notMet.getEngineerId())){ if (!loginUser.getIsAdmin() && !userId.equals(notMet.getEngineerId())){
throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT); throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT);
} }
} }