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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yjz
2023-10-12 15:48:52 +08:00
parent 84cdd22649 cff8384874
commit 263aa80707
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
private Map<String, Object> setVariables(ProcessEsInitChange initChange) { private Map<String, Object> setVariables(ProcessEsInitChange initChange) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
// 设置流程中各个节点的人 // 设置流程中各个节点的人
map.put("draftUser", UserUtils.getUserIdByUserName(initChange.getCreateBy())); map.put("createUser", UserUtils.getUserIdByUserName(initChange.getCreateBy()));
map.put("contactUser", initChange.getContactUser()); map.put("contactUser", initChange.getContactUser());
map.put("standardExpertList", Optional.ofNullable(initChange.getStandardExpert()).map(s -> Arrays.asList(s.split(","))).orElse(Collections.emptyList())); map.put("standardExpertList", Optional.ofNullable(initChange.getStandardExpert()).map(s -> Arrays.asList(s.split(","))).orElse(Collections.emptyList()));
map.put("mainDraftUserLeader", initChange.getMainDraftUserLeader()); map.put("mainDraftUserLeader", initChange.getMainDraftUserLeader());
laws-modules/src/main/java/com/jero/modules/sys/utils/UserUtils.java
+1 -1
View File
@@ -20,6 +20,6 @@ public class UserUtils {
public static String getUserIdByUserName(String createBy) { public static String getUserIdByUserName(String createBy) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
return sysUser.getUsername(); return sysUser.getId();
} }
} }