更改用户复制BUG

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -876,7 +876,6 @@ public class ProTaskServiceImpl implements IProTaskService {
         feedback.setWorkstationId(DataUtil.repliceData(feedback.getWorkstationId(), workstation.getWorkstationId()));
         feedback.setFeedbackType("SELF");
         feedback.setWorkunitId(taskWorkunit.getWorkunitId());
-        feedback.setNickName(sysUserMapper.selectUserById(SecurityUtils.getUserId()).getNickName());
 
         //暂停更新记录
         if (Objects.equals(taskWorkunit.getStatus(), FINISHED.getStatus())) {

system/src/main/java/com/ximai/system/mapper/SysUserMapper.java

@@ -136,7 +136,7 @@ public interface SysUserMapper {
     @Select(value = "select * from sys_user  ${ew.customSqlSegment}")
     List<SysUser> selectListByQw(@Param("ew") QueryWrapper<SysUser> user);
 
-    void batchWorkunitWorker(@Param("copiedUserId")Long copiedUserId, @Param("userId")Long userId, @Param("username")String username);
+    void batchWorkunitWorker(@Param("copiedUserId")Long copiedUserId, @Param("userId")Long userId,@Param("userName")String userName,@Param("nickName")String nickName, @Param("createName")String createName);
 
     void deleteWorkunitWorkerByUserIds(@Param("userIds")List<Long> userIds);
 

system/src/main/java/com/ximai/system/service/impl/SysUserServiceImpl.java

@@ -603,7 +603,8 @@ public class SysUserServiceImpl implements ISysUserService {
         //批量插入岗位资源
         userMapper.deleteWorkunitWorkerByUserIds(userIds);
         for (Long userId : userIds){
-            userMapper.batchWorkunitWorker(copiedUserId,userId,SecurityUtils.getUsername());
+            SysUser sysUserCopy = userMapper.selectUserById(userId);
+            userMapper.batchWorkunitWorker(copiedUserId,userId,sysUserCopy.getUserName(),sysUserCopy.getNickName(),SecurityUtils.getUsername());
         }
     }
 

system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -242,10 +242,10 @@
                post_id ,
                post_name,
                #{userId},
-               user_name,
-               nick_name,
+               #{userName},
+               #{nickName},
                remark,
-               #{username},
+               #{createName},
                now() from md_workunit_worker where user_id = #{copiedUserId}
     </insert>