Quellcode durchsuchen

createBy调整为username

陈长荣 vor 3 Monaten
Ursprung
Commit
3b5ce20b69

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

@@ -60,17 +60,18 @@ public class NotifyServiceImpl implements NotifyService {
         }
 
         Long userId;
+        Long createById = userIdNameCache.getUserIdByUsername(flowInfo.getCreateBy());
         String dingMsg;
         GeneStatusEnum statusEnum = Objects.requireNonNull(GeneStatusEnum.getByStatus(flowInfo.getStatus()));
         switch (statusEnum) {
             case REJECTED:
                 //驳回通知申请人
-                userId = userIdNameCache.getUserIdByUsername(flowInfo.getCreateBy());
+                userId = createById;
                 dingMsg = String.format("【基因定制/%s】【%s/%s】不同意,请修正后再提交", flowInfo.getProjectName(), previousStatus, previousUser);
                 break;
             case GENE_EDITING:
                 userId = flowInfo.getGeneEditPlId();
-                dingMsg = String.format("【基因定制/%s】【%s】已提交,请进行审查", flowInfo.getProjectName(), userIdNameCache.getNicknameByUserId(flowInfo.getCreateBy()));
+                dingMsg = String.format("【基因定制/%s】【%s】已提交,请进行审查", flowInfo.getProjectName(), userIdNameCache.getNicknameByUserId(createById));
                 break;
             case PROJECT_LEADER:
                 userId = flowInfo.getProjectLeaderId();
@@ -82,7 +83,7 @@ public class NotifyServiceImpl implements NotifyService {
                 break;
             case COMPLETED:
                 //执行
-                userId = userIdNameCache.getUserIdByUsername(flowInfo.getCreateBy());
+                userId = createById;
                 dingMsg = String.format("【基因定制/%s】【%s/%s】已同意,请执行项目", flowInfo.getProjectName(), previousStatus, previousUser);
                 break;
             default:

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

@@ -339,7 +339,7 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         List<SampleAuditDto> auditDtos = new ArrayList<>();
         for (FlowAudit audit : auditList) {
             SampleAuditDto auditDto = BeanUtil.copyProperties(audit, SampleAuditDto.class);
-            auditDto.setCreateName(userIdNameCache.getNicknameByUserId(audit.getCreateBy()));
+            auditDto.setCreateName(userIdNameCache.username2Nickname(audit.getCreateBy()));
             auditDto.setFlowStatusLabel(Objects.requireNonNull(GeneStatusEnum.getByStatus(audit.getFlowStatus())).getDescription());
             if (StrUtil.isNotBlank(audit.getAdditionalData())) {
                 JSONObject jsonObject = JSONObject.parseObject(audit.getAdditionalData());