WL/laws_weilai
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:
qq787203167
2022-05-18 13:45:52 +08:00
parent 2c3a5b0192 8c68dd57d0
commit 52bebbbc0a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java
+1 -1
View File
@@ -92,6 +92,6 @@ public class ProcessHistoryEO implements Serializable {
/**用户账号，页面展示字段**/ /**用户账号，页面展示字段**/
@TableField(exist = false) @TableField(exist = false)
private String operatorPersonName;; private String assignee;;
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java
+1 -1
View File
@@ -146,7 +146,7 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
} }
if(StringUtils.isNotEmpty(data.getOperatorPersonId()) && CollectionUtils.isNotEmpty(sysUserList)){ if(StringUtils.isNotEmpty(data.getOperatorPersonId()) && CollectionUtils.isNotEmpty(sysUserList)){
SysUser userInfo = sysUserList.stream().filter(sysUser -> sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0); SysUser userInfo = sysUserList.stream().filter(sysUser -> sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0);
data.setOperatorPersonId(userInfo.getUsername()); data.setAssignee(userInfo.getUsername());
} }
} }
} }