Merge branch 'dev_2.6.0' of http://120.46.174.3:8099/zlmy/zlmy-cloud into dev_2.6.0

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysUserController.java

@@ -685,5 +685,19 @@ public class NewSysUserController extends SuperController {
         EasyExcel.write(response.getOutputStream(), UserImport.class).sheet("数据").doWrite(new ArrayList<>());
     }
 
+    @ApiOperation(
+            value = "【根据用户id集合获取用户列表信息】",
+            notes = "根据用户id集合获取用户列表信息"
+    )
+    @GetMapping({"/listByUserIds"})
+    public BaseResponse<BaseResponseList<SysUser>> listByUserIds(String userIds) {
+        BaseResponse<BaseResponseList<SysUser>> baseResponse = new BaseResponse<>();
+        List<SysUser> sysUsers = tSysUserService.getUserListByUserIds(userIds);
+        BaseResponseList<SysUser> baseResponseList = new BaseResponseList<>();
+        baseResponseList.setData(sysUsers);
+        baseResponse.setData(baseResponseList);
+        return baseResponse;
+    }
+
 
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/TSysUserService.java

@@ -3,6 +3,8 @@ package com.testor.module.sys.service;
 import com.testor.biz.sys.user.model.domain.SysUser;
 import com.testor.module.sys.model.dto.CustomerRemovalDto;
 
+import java.util.List;
+
 /**
  * @author rsq
  * @program zlmy_boot
@@ -16,4 +18,6 @@ public interface TSysUserService {
    SysUser getUserByLoginName(String loginName);
 
    String getUserNamesByUserIds(String userIds);
+
+   List<SysUser> getUserListByUserIds(String userIds);
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/impl/TSysUserServiceImpl.java

@@ -31,6 +31,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -108,6 +109,20 @@ public class TSysUserServiceImpl implements TSysUserService {
         return String.join(",", userNames);
     }
 
+    @Override
+    public List<SysUser> getUserListByUserIds(String userIds) {
+        String[] userIdList = userIds.split(",");
+        List<SysUser> sysUsers = sysUserService.list(new QueryWrapper<SysUser>().in(SysUser.USER_ID, userIdList));
+        for (SysUser sysUser : sysUsers) {
+            String orgId = sysUser.getOrgId();
+            SysOrg byId = sysOrgService.getById(orgId);
+            if (byId != null) {
+                sysUser.setOrgName(byId.getOrgName());
+            }
+        }
+        return sysUsers;
+    }
+
     /**
      * 用户迁移
      *