admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-04-21 10:50:03 +08:00
parent 92c9175c29
commit a0a4b49c63
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseMenuController.java
View File

@ -223,8 +223,7 @@ public class BaseMenuController {
//"userType:roleName":{"发起":[formName],"审批":[formName]}
List<DictionaryItem> userTypes = dictionaryItemService.getDictList("user_type", null);
Map<String, JSONObject> roleMap = new TreeMap<>();
List<WflowModelHistorys> wflowModelHistorys = wflowModelHistorysMapper.selectList(Wrappers.<WflowModelHistorys>lambdaQuery()
.in(WflowModelHistorys::getFormId, (List) param.get("idList")));
List<WflowModelHistorys> wflowModelHistorys = wflowModelHistorysMapper.getNewsVersionList((List) param.get("idList"));
for (WflowModelHistorys model : wflowModelHistorys) {
//发起人:流程名称
Map<String, String> launchUserIdMap = new HashMap<>();
@ -277,15 +276,19 @@ public class BaseMenuController {
.in(BaseRole::getRoleId, roleIds));
for (BaseRole role : roles) {
String userTypeName = userTypes.stream().filter(o -> o.getData().equals(role.getUserType())).findFirst().map(o -> o).orElse(null).getName();
roleMap.compute(userTypeName + ":" + role.getRoleName(), (k, v) -> {
String key = userTypeName + ":" + role.getRoleName();
roleMap.compute(key, (k, v) -> {
if (v == null) {
v = new JSONObject();
}
JSONObject finalV = v;
v.compute(approve, (k1, v1) -> {
if (v1 == null) {
v1 = new HashSet<>();
}
((Set) v1).add(formName);
if (approve.equals("发起") || !Optional.ofNullable(finalV.getJSONArray("发起")).map(m -> m.contains(formName)).orElse(false)) {
((Set) v1).add(formName);
}
return v1;
});
return v;