From 6d90aa0d86d4ef7d1eb4eda5dab1c10dc9e9df26 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 11 五月 2021 15:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 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 ec39c50..ece16a6 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
@@ -253,6 +253,7 @@
                 loginUserInfoVO.setIsmemberrole(1);
             }
         }
+        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);
         return R.ok(loginUserInfoVO);
     }
 
@@ -605,6 +606,9 @@
         }
         int update = userDao.updateById(sysUserDO);
         if (update > 0) {
+            //清空缓存
+            String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
+            stringRedisTemplate.delete(userKey);
             //实名认证成功查询是否有已审核的党员信息,有则更新党员信息绑定党员的userId
             Long memberId = userDao.getPartyBuildingByIdCard(idCard);
             if(memberId != null){
@@ -1430,6 +1434,24 @@
     }
 
     /**
+     * 修改用户的党员状态
+     *
+     * @param idCard 身份证号
+     * @return 修改结果
+     */
+    @Override
+    public R updateUserNotPartymember(String idCard) {
+        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1));
+        if(sysUserDO != null){
+            sysUserDO.setIsPartymember(0);
+            userDao.updateById(sysUserDO);
+            log.info("新增党员修改用户为非党员状态成功 身份证号【{}】", idCard);
+        }
+        return R.ok();
+    }
+
+
+    /**
      * 获取各种协议
      *
      * @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策

--
Gitblit v1.7.1