From 447b572ecd2c8a7a966cf20d6b4ee66440577901 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 25 Sep 2023 18:22:23 +0800
Subject: [PATCH] chore: compose workflow api

---
 .../com/cloud/kicc/system/controller/RoleController.java    | 6 ++++++
 .../com/cloud/kicc/system/controller/UserController.java    | 6 ++++++
 .../java/com/cloud/kicc/system/service/UserService.java     | 5 +++++
 .../com/cloud/kicc/system/service/impl/UserServiceImpl.java | 5 +++++
 .../src/main/resources/mapper/UserMapper.xml                | 6 ++++++
 5 files changed, 28 insertions(+)

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java
index d8d33b75..35a1bfaf 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java
@@ -67,6 +67,12 @@ public class RoleController {
         return R.ok(role);
     }
 
+    @GetMapping("/getByIds/{ids:[\\w,]+}")
+    public R getByIds(@PathVariable String[] ids) {
+        List<Role> roles = roleService.listByIds(Arrays.asList(ids));
+        return R.ok(roles);
+    }
+
     @SysLog("角色新增")
     @PostMapping("/save")
     @PreAuthorize("@pms.hasPermission('role_add')")
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
index b0092989..815b0c6d 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
@@ -101,6 +101,12 @@ public class UserController {
         return R.ok(new ResultVo().setResult(user).setExtend(roleList));
     }
 
+    @GetMapping("/getByIds/{ids}")
+    public R getByIds(@PathVariable String[] ids) {
+        List<KiccUser> users = userService.getUserByIds(Arrays.asList(ids));
+        return R.ok(users);
+    }
+
     @Inner
     @GetMapping("/getUser/{id:\\w+}")
     public R getUser(@PathVariable("id") String id) {
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java
index b714b3fd..5d23fb21 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java
@@ -73,6 +73,11 @@ public interface UserService extends IService<User> {
      */
     KiccUser getUserById(String userId);
 
+    /**
+     * 根据多个id查询多个用户
+     * @param userIds 多个用户ID
+     */
+    List<KiccUser> getUserByIds(List<String> userIds);
 
     /**
      * 根据casUserId查询用户
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java
index 8268d03d..3838a5c4 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java
@@ -211,6 +211,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return baseMapper.getUserByParam(MapUtil.<String, Object>builder("id", userId).build());
     }
 
+    @Override
+    public List<KiccUser> getUserByIds(List<String> userIds) {
+        return baseMapper.getUserByParamList(MapUtil.<String, Object>builder("ids", userIds).build());
+    }
+
     @Override
     public KiccUser getUserByCasUserId(String casUserId) {
         return baseMapper.getUserByParam(MapUtil.<String, Object>builder("casUserId", casUserId).build());
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml
index e0d61c3a..de0b1f65 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml
@@ -71,6 +71,12 @@
             <if test="phone != null and phone != ''">
                 and phone = #{phone}
             </if>
+            <if test="ids != null and ids != ''">
+                and id in
+                <foreach collection="ids" item="item" open="(" close=") "
+                         index="index" separator=",">#{item}
+                </foreach>
+            </if>
         </where>
         order by create_time asc
     </select>