feat:导入金额查询

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java

@@ -78,8 +78,8 @@ public interface RemoteUserService {
     @PostMapping("/user/list")
     R<List<SysUser>> getUserById(@RequestBody List<Long> userIds);
 
-    @GetMapping("/user/user-dept")
-    R<List<UserVO>> getUserDeptByIds(@RequestParam("userIds") List<Long> userIds);
+    @PostMapping("/user/user-dept")
+    R<List<UserVO>> getUserDeptByIds(@RequestBody List<Long> userIds);
 
     /**
      * 通过社交账号或手机号查询用户、角色信息

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java

@@ -351,8 +351,8 @@ public class SysUserController {
         return R.ok(userService.list(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds)));
     }
 
-    @GetMapping("/user-dept")
-    public R<List<UserVO>> getUserDeptByIds(@RequestParam("userIds") List<Long> userIds) {
+    @PostMapping("/user-dept")
+    public R<List<UserVO>> getUserDeptByIds(@RequestBody List<Long> userIds) {
         return R.ok(userService.getUserDeptByIds(userIds));
     }
 

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -253,9 +253,9 @@
                     #{id}
                 </foreach>
             </if>
-            <if test="query.ids != null and query.ids.size() != 0">
+            <if test="ids != null">
                 AND u.user_id in
-                <foreach collection="query.ids" index="index" item="id" open="(" separator="," close=")">
+                <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
             </if>

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java

@@ -83,9 +83,9 @@ public class WalletRechargeImportServiceImpl extends ServiceImpl<WalletRechargeI
             // 用户
             List<Long> userIds = list.stream().map(WalletRechargeImportVo::getUserId).distinct().toList();
             if (ObjectUtil.isNotEmpty(userIds)) {
-                R<List<SysUser>> userList = userService.getUserById(new ArrayList<>(userIds));
+                R<List<UserVO>> userList = userService.getUserDeptByIds(new ArrayList<>(userIds));
                 if (ObjectUtil.isNotEmpty(userList.getData())) {
-                    DataUtil.convertUserList(list, CollectionUtils.convertMap(userList.getData(), SysUser::getUserId));
+                    DataUtil.convertUserDeptList(list, CollectionUtils.convertMap(userList.getData(), UserVO::getUserId));
                 }
             }
         }
@@ -155,9 +155,9 @@ public class WalletRechargeImportServiceImpl extends ServiceImpl<WalletRechargeI
             // 用户
             List<Long> userIds = list.stream().map(WalletRechargeImportVo::getUserId).distinct().toList();
             if (ObjectUtil.isNotEmpty(userIds)) {
-                R<List<SysUser>> userList = userService.getUserById(new ArrayList<>(userIds));
+                R<List<UserVO>> userList = userService.getUserDeptByIds(new ArrayList<>(userIds));
                 if (ObjectUtil.isNotEmpty(userList.getData())) {
-                    DataUtil.convertUserList(list, CollectionUtils.convertMap(userList.getData(), SysUser::getUserId));
+                    DataUtil.convertUserDeptList(list, CollectionUtils.convertMap(userList.getData(), UserVO::getUserId));
                 }
             }
             // 饭卡类型