From 5e361c69f5bbc2d7b4aa70ad9241563314301f16 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 16 八月 2021 16:44:22 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 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..aec18e7 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,6 +589,7 @@
      */
     @Override
     public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
+
         SysUserDO sysUserDO = new SysUserDO();
         sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
 //        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
@@ -609,7 +599,7 @@
             //删除用户信息缓存
             String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
             stringRedisTemplate.delete(userKey);
-            return R.ok();
+            return R.fail();
         }
         return R.fail();
     }

--
Gitblit v1.7.1