Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/AdminChangeConfigServiceImpl.java

@@ -167,9 +167,6 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         return AjaxResult.success(typeService.queryConfigType());
     }
 
-    @Autowired
-    AdminUserHolder userHolder;
-
     /**
      * 添加变更模板并参数拼接
      * @param changeTypes

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeExecConfigServiceImpl.java

 package com.netease.mail.yanxuan.change.biz.service.impl.change;
 
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeExecConfigService;
+import com.netease.mail.yanxuan.change.common.bean.AdminUserHolder;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeExecConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,14 @@ public class ChangeExecConfigServiceImpl implements ChangeExecConfigService {
         long currentTime = System.currentTimeMillis();
         //循环添加
         for (ChangeExecConfig changeExecConfig : changeExecConfigs){
+            //如果变更行动方案是变更发起人的话就填充登入人信息
+            if(changeExecConfig.getChangeExecUserType() == 1){
+                changeExecConfig.setChangeExecUser(AdminUserHolder.getUserName());
+            }
+            //在修改的时候实际上删除在新增需要屏蔽掉ID
+            if (changeExecConfig.getId() != null){
+                changeExecConfig.setId(null);
+            }
             changeExecConfig.setChangeTemplateId(id);
             changeExecConfig.setCreateTime(currentTime);
             changeExecConfig.setUpdateTime(currentTime);

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeExecConfigReq.java

@@ -21,7 +21,7 @@ public class ChangeExecConfigReq {
     /**
      * 变更类型配置记录id
      */
-    @NotNull(message = "变更记录id不可为空")
+    //@NotNull(message = "变更记录id不可为空")
     private Long changeTemplateId;
 
     /**