From 2fd7075278ae5fc451fe0eb39a84c898f26c21f6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:21:33 +0800
Subject: [PATCH] 随手拍改版

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   40 +++++++++++++++-------------------------
 1 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index ee08b9f..39b3415 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -396,23 +396,12 @@
     /**
      * 分页查询人口管理
      *
-     * @param loginUserInfoVO 查询参数
+     * @param userInfoVO 查询参数
      * @return 分页数据
      */
     @Override
-    public R pageUser(LoginUserInfoVO loginUserInfoVO) {
-        Page page = new Page<>();
-        Long pageNum = loginUserInfoVO.getPageNum();
-        Long pageSize = loginUserInfoVO.getPageSize();
-        if (null == pageNum || 0 == pageNum) {
-            pageNum = 1l;
-        }
-        if (null == pageSize || 0 == pageSize) {
-            pageSize = 10l;
-        }
-        page.setSize(pageSize);
-        page.setCurrent(pageNum);
-        IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO);
+    public R pageUser(AppletUserInfoVO userInfoVO) {
+        IPage<AppletUserInfoVO> iPage = userDao.pageUser(new Page<>(userInfoVO.getPageNum(),userInfoVO.getPageSize()), userInfoVO);
         iPage.getRecords().forEach(record -> {
             record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
             record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
@@ -600,17 +589,18 @@
      */
     @Override
     public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
-        SysUserDO sysUserDO = new SysUserDO();
-        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
-//        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
-        sysUserDO.setUserId(loginUserInfoVO.getUserId());
-        int update = userDao.updateById(sysUserDO);
-        if (update > 0) {
-            //删除用户信息缓存
-            String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
-            stringRedisTemplate.delete(userKey);
-            return R.ok();
-        }
+
+//        SysUserDO sysUserDO = new SysUserDO();
+//        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
+////        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
+//        sysUserDO.setUserId(loginUserInfoVO.getUserId());
+//        int update = userDao.updateById(sysUserDO);
+//        if (update > 0) {
+//            //删除用户信息缓存
+//            String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
+//            stringRedisTemplate.delete(userKey);
+//            return R.fail();
+//        }
         return R.fail();
     }
 

--
Gitblit v1.7.1