From 9cb1067d4c153f286484340d0a20635cf3a41b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 16 Mar 2020 14:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=80=E6=9C=89=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/UserController.java | 13 ++++++++++ .../java/com/elink/esua/epdc/dao/UserDao.java | 1 + .../elink/esua/epdc/service/UserService.java | 11 +++++++++ .../epdc/service/impl/UserServiceImpl.java | 24 +++++++++++++++---- .../src/main/resources/mapper/UserDao.xml | 3 ++- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 42c1c4d9d..d6510112c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -142,4 +142,17 @@ public class UserController { public Result importExcel(@RequestParam("file") MultipartFile file,@RequestParam Map params) { return userService.insertUserList(file,params); } + + /*** + * 展示所有的 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/3/16 10:51 + */ + @GetMapping("alluserpage") + public Result> alluserpage(@RequestParam Map params) { + PageData page = userService.allUserPage(params); + return new Result>().ok(page); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index e53bb438b..202fde7ce 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -188,4 +188,5 @@ public interface UserDao extends BaseDao { * @since 2020/3/7 15:31 */ List selectListOfOrganizationInfo(String deptId); + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index 30c7e0227..6cd43b92c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -308,4 +308,15 @@ public interface UserService extends BaseService { * @since 2020/3/7 1:23 */ void modifyOrganizationInfo(OrganizationModifyDTO dto); + + + /*** + * 所有用户 用来锁定已注册在别的微信里面的信息 + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author qushutong + * @date 2020/3/16 10:53 + */ + PageData allUserPage(Map params); + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 1f2b7c0cc..47f211d84 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -863,7 +863,7 @@ public class UserServiceImpl extends BaseServiceImpl implem /** * @param gridIdList - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 根据网格id查询网格下所有的用户 * @Date 2019/12/19 15:03 @@ -1124,18 +1124,18 @@ public class UserServiceImpl extends BaseServiceImpl implem } } + /** - * * 组织机构信息处理 * - * @params [dto, userList] * @return java.util.List + * @params [dto, userList] * @author liuchuang * @since 2020/3/7 15:22 */ private List handleOrganizationInfo(OrganizationModifyDTO dto, List userList) { List entities = new ArrayList<>(); - for (UserDTO user: userList) { + for (UserDTO user : userList) { UserEntity entity = new UserEntity(); if (StringUtils.isNotEmpty(user.getParentDeptIds()) && StringUtils.isNotEmpty(user.getParentDeptNames())) { List parentDeptIds = Arrays.asList(user.getParentDeptIds().split(",")); @@ -1164,4 +1164,20 @@ public class UserServiceImpl extends BaseServiceImpl implem return entities; } + + @Override + @DataSource(value = DataSourceNames.FIRST) + public PageData allUserPage(Map params) { + String[] paramKeys = new String[]{"nickname", "identityNo", "realName", "identityNo", "mobile", "startTime", "endTime"}; + if (AppUserUtils.isDefaultQuery(params, paramKeys)) { + List userDtoList = Lists.newArrayList(); + return new PageData<>(userDtoList, NumConstant.ZERO); + } + this.verifyParams(params); + // 查询当前用户所具有的的数据权限 + IPage iPage = this.getPage(params); + List userDtoList = this.baseDao.selectListUserDto(params); + return new PageData<>(userDtoList, iPage.getTotal()); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 84f7768f2..ad3d2c4d8 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -70,7 +70,8 @@ ADDRESS, STATE, PARTY_FLAG, - ug.ALL_DEPT_NAMES AS myGridName + ug.ALL_DEPT_NAMES, + u.FACE_IMG FROM epdc_user u LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID