From a177ab306724b8c2e02c02393100a030d0b400d5 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Wed, 24 Sep 2025 13:16:18 +0800
Subject: [PATCH] bug

---
 .../service/impl/SubUserSalaryDetailServiceImpl.java |  1 +
 .../design/service/impl/DesUserServiceImpl.java      | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java
index e4b6156b..3e5e84e2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubUserSalaryDetailServiceImpl.java
@@ -706,6 +706,7 @@ public class SubUserSalaryDetailServiceImpl extends ServiceImpl<SubUserSalaryDet
         wrapper.eq( dto.getTeamId()!=null,SubUserSalaryDetail::getTeamId, dto.getTeamId());
         wrapper.eq(dto.getUserId()!=null,SubUserSalaryDetail::getUserId, dto.getUserId());
         wrapper.between(SubUserSalaryDetail::getReportDate,start, end);
+        wrapper.orderByAsc(SubUserSalaryDetail::getReportDate);
 
         return this.list(wrapper);
     }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java
index b3082584..56bdc6c5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesUserServiceImpl.java
@@ -167,8 +167,14 @@ public class DesUserServiceImpl extends ServiceImpl<DesUserMapper, DesUser> impl
         List<DesUser> desUsers = MapstructUtils.convert(dto.getList(), DesUser.class);
 
         roleService.deleteDesignUser(dto.getProjectId());
+
+        ArrayList<String> userIds =  new ArrayList<>();
+
         List<SysUserRole> sysUserRoles = new ArrayList<>();
         for (DesUserBo bo : dto.getList()) {
+            if(bo.getUserId()==null){
+                continue;
+            }
             SysUserRole sysUserRole = new SysUserRole();
             if("3".equals(bo.getUserType())){
                 sysUserRole.setRoleId(1961314792461586433L);
@@ -176,10 +182,16 @@ public class DesUserServiceImpl extends ServiceImpl<DesUserMapper, DesUser> impl
                 sysUserRole.setRoleId(1961315028017893378L);
             }else if("4".equals(bo.getUserType())){
                 sysUserRole.setRoleId(1961315147199041537L);
+            }else {
+                continue;
             }
             sysUserRole.setUserId(bo.getUserId());
             sysUserRole.setProjectId(dto.getProjectId());
+            if(userIds.contains(sysUserRole.getUserId()+"-"+sysUserRole.getRoleId())){
+                continue;
+            }
             sysUserRoles.add(sysUserRole);
+            userIds.add(sysUserRole.getUserId()+"-"+sysUserRole.getRoleId());
         }
         roleService.insertUserRoleBatch(sysUserRoles);
         //todo:发消息