添加查询账号接口

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java

@@ -52,6 +52,9 @@ public interface IPersonnelService {
     List<SysUser> findSysUserByIds(Long[] ids);
 
     @ApiOperation(value = "查询账号信息")
+    ListPager<SysUser> querySysUser(UserDetailModel model, Pager pager);
+
+    @ApiOperation(value = "查询账号信息")
     List<SysUser> querySysUserByUserDetailModelOrIds(UserDetailModel model, List<Long> ids);
 
     @ApiOperation(value = "查询账号信息")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java

@@ -574,7 +574,7 @@ public class PersonnelController extends CoreBaseController {
      * @param model 查询条件
      * @return 处理结果
      */
-    @PostMapping(value = "/pager/get-user-list")
+    @PostMapping(value = "/pager/get-user-info-list")
     @ApiOperation(value = "根据条件分页查询用户信息", notes = "根据条件分页查询用户信息")
     public ResultBean queryPagerByUserInfo(@RequestBody UserDetailPagerModel model) {
         try {
@@ -588,6 +588,24 @@ public class PersonnelController extends CoreBaseController {
     }
 
     /**
+     * 根据条件分页查询用户信息
+     * @param model 查询条件
+     * @return 处理结果
+     */
+    @PostMapping(value = "/pager/get-user-list")
+    @ApiOperation(value = "根据条件分页查询账号信息", notes = "根据条件分页查询账号信息")
+    public ResultBean queryPagerByUser(@RequestBody UserDetailPagerModel model) {
+        try {
+            ListPager<SysUser> listPager = personnelService.querySysUser(model.getUserDetailModel(), model.getPager());
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(listPager);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    /**
      * 获取账号的所有组织信息集合
      * @return 组织信息集合
      */

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java

@@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.*;
@@ -161,6 +162,13 @@ public class PersonnelServiceService implements IPersonnelService {
     }
 
     @Override
+    public ListPager<SysUser> querySysUser(UserDetailModel model, Pager pager) {
+        DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUser(model.getSysUser(), StringTool.getListLong(model.getUserIdList()));
+        pager = PagerHelper.getPager(pager, userRDao.findByHqlWhereCount(packBean));
+        return new ListPager<>(userRDao.findByHqlWherePage(packBean, pager), pager);
+    }
+
+    @Override
     public List<SysUser> querySysUserByUserDetailModelOrIds(UserDetailModel model, List<Long> ids) {
         LOGGER.info("平台用户 SysUser model:{} ids:{}", model, ids);
         String modeWhere = HqlModelPack.packHqlSysUserByModelOrIds(model, ids);
@@ -209,8 +217,10 @@ public class PersonnelServiceService implements IPersonnelService {
 
     @Override
     public ListPager<SysUserInfo> querySysUserInfo(UserDetailModel model, Pager pager) {
-        pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo())));
-        return new ListPager<>(userInfoRDao.findByHqlWherePage(CoreHqlPack.packHqlSysUserInfo(model.getSysUserInfo()), pager), pager);
+        DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUserInfo(model.getSysUserInfo(), StringTool.getListLong(model.getUserInfoIdList()));
+
+        pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(packBean));
+        return new ListPager<>(userInfoRDao.findByHqlWherePage(packBean, pager), pager);
     }
 
     @Override