createBy、updateBy原来使用userId现在改username

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/controller/FlowController.java

@@ -118,7 +118,7 @@ public class FlowController {
                 auditDto = BeanUtil.toBean(audit.getAdditionalData(), FlowAuditDto.class);
             }
             BeanUtil.copyProperties(audit, auditDto);
-            auditDto.setCreateName(userIdNameCache.getNicknameByUserId(audit.getCreateBy()));
+            auditDto.setCreateName(userIdNameCache.username2Nickname(audit.getCreateBy()));
             auditDto.setFlowStatusLabel(Objects.requireNonNull(GeneStatusEnum.getByStatus(audit.getFlowStatus())).getDescription());
             auditDtos.add(auditDto);
         }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -104,7 +104,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
 
         records.forEach(item -> {
             //补充申请人姓名
-            item.setCreateByName(userIdNameCache.getNicknameByUserId(Long.parseLong(item.getCreateBy())));
+            item.setCreateByName(userIdNameCache.username2Nickname(item.getCreateBy()));
             //查询下载链接
             FileVo latestFile = fileVersionService.getLatestFile(item.getId());
             item.setFileUrl(latestFile.getUrl());
@@ -205,7 +205,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         if (GeneStatusEnum.REJECTED.getStatus().equals(flowInfo.getStatus())) {
             log.info("流程 id={} 驳回后重新提交，更新申请日期和申请人", flowInfo.getId());
             updateInfo.setVersion(flowInfo.getVersion() + 1)
-                    .setCreateBy(UserUtil.getUserId().toString())
+                    .setCreateBy(UserUtil.getUserName())
                     .setCreateTime(new Date());
         }
         updateInfo.updateById();
@@ -315,7 +315,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         projectFeignDTO.setLeader(vo.getProjectLeader());
         projectFeignDTO.setProjectType(vo.getApprovalType());
         projectFeignDTO.setProjectCode(flowInfo.getApprovalNo());
-        projectFeignDTO.setApplicantUserId(Long.parseLong(flowInfo.getCreateBy()));
+        projectFeignDTO.setApplicantUserId(userIdNameCache.getUserIdByUsername(flowInfo.getCreateBy()));
 
         //推送申请人nickname
         String nickname = userIdNameCache.getNicknameByUserId(vo.getProjectLeader());
@@ -405,7 +405,7 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         //待提交状态下不显示申请人和申请日期
         if (!GeneStatusEnum.SUBMIT_STATUS.contains(flowInfo.getStatus())) {
             dataMap.put("createDateStr", createDate);
-            String sign = userIdNameCache.getSignBase64(Long.valueOf(flowInfo.getCreateBy()));
+            String sign = userIdNameCache.getSignBase64(userIdNameCache.getUserIdByUsername(flowInfo.getCreateBy()));
             if (StrUtil.isNotBlank(sign)) {
                 dataMap.put("createBySign", sign);
             }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/NotifyServiceImpl.java

@@ -56,7 +56,7 @@ public class NotifyServiceImpl implements NotifyService {
         if (previousAudit != null) {
             GeneStatusEnum statusEnum = GeneStatusEnum.getByStatus(previousAudit.getFlowStatus());
             previousStatus = statusEnum != null ? statusEnum.getDescription() : "";
-            previousUser = userIdNameCache.getNicknameByUserId(previousAudit.getCreateBy());
+            previousUser = userIdNameCache.username2Nickname(previousAudit.getCreateBy());
         }
 
         Long userId;
@@ -65,7 +65,7 @@ public class NotifyServiceImpl implements NotifyService {
         switch (statusEnum) {
             case REJECTED:
                 //驳回通知申请人
-                userId = Long.valueOf(flowInfo.getCreateBy());
+                userId = userIdNameCache.getUserIdByUsername(flowInfo.getCreateBy());
                 dingMsg = String.format("【基因定制/%s】【%s/%s】不同意，请修正后再提交", flowInfo.getProjectName(), previousStatus, previousUser);
                 break;
             case GENE_EDITING:
@@ -82,7 +82,7 @@ public class NotifyServiceImpl implements NotifyService {
                 break;
             case COMPLETED:
                 //执行
-                userId = Long.valueOf(flowInfo.getCreateBy());
+                userId = userIdNameCache.getUserIdByUsername(flowInfo.getCreateBy());
                 dingMsg = String.format("【基因定制/%s】【%s/%s】已同意，请执行项目", flowInfo.getProjectName(), previousStatus, previousUser);
                 break;
             default:

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/CommonSampleEditServiceImpl.java

@@ -67,7 +67,7 @@ public class CommonSampleEditServiceImpl implements SampleEditService {
             previousAudit = flowAudits.get(0);
             GeneStatusEnum statusEnum = GeneStatusEnum.getByStatus(previousAudit.getFlowStatus());
             previousStatus = statusEnum != null ? statusEnum.getDescription() : "";
-            previousUser = userIdNameCache.getNicknameByUserId(previousAudit.getCreateBy());
+            previousUser = userIdNameCache.username2Nickname(previousAudit.getCreateBy());
         }
 
         String projectType = sampleInfo.projectType();
@@ -79,7 +79,7 @@ public class CommonSampleEditServiceImpl implements SampleEditService {
         switch (statusEnum) {
             case REJECTED:
                 //驳回通知申请人
-                userId = Long.valueOf(sampleInfo.getCreateBy());
+                userId = userIdNameCache.getUserIdByUsername(sampleInfo.getCreateBy());
                 dingMsg = String.format("【%s】【%s/%s】%s不同意，请修正后再提交", projectType, previousStatus, previousUser, now);
                 break;
             case DEPART_LEADER:
@@ -92,7 +92,7 @@ public class CommonSampleEditServiceImpl implements SampleEditService {
                 break;
             case COMPLETED:
                 //执行
-                userId = Long.valueOf(sampleInfo.getCreateBy());
+                userId = userIdNameCache.getUserIdByUsername(sampleInfo.getCreateBy());
                 dingMsg = String.format("【%s】【%s/%s】%s同意，请执行项目", projectType, previousStatus, previousUser, now);
                 break;
             default:

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -161,7 +161,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         if (GeneStatusEnum.REJECTED.getStatus().equals(sampleInfo.getStatus())) {
             log.info("流程 id={} 驳回后重新提交，更新申请日期和申请人", sampleInfo.getId());
             updateInfo.setVersion(sampleInfo.getVersion() + 1)
-                    .setCreateBy(UserUtil.getUserId().toString())
+                    .setCreateBy(UserUtil.getUserName())
                     .setCreateTime(new Date());
         }
         updateInfo.updateById();
@@ -375,7 +375,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         projectFeignDTO.setLeader(vo.getProjectLeader());
         projectFeignDTO.setProjectType(vo.getApprovalType());
         projectFeignDTO.setProjectCode(projectNo);
-        projectFeignDTO.setApplicantUserId(Long.parseLong(sampleInfo.getCreateBy()));
+        projectFeignDTO.setApplicantUserId(userIdNameCache.getUserIdByUsername(sampleInfo.getCreateBy()));
 
         //推送申请人nickname
         String leaderNickname = userIdNameCache.getNicknameByUserId(vo.getProjectLeader());