From 945c7091d1db4e156a7a2b5ccd24c888cbce40a5 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 31 十月 2022 14:11:04 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 4d1762f..8731449 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
@@ -364,6 +364,13 @@
set.add(sysRoleDO.getRoleKey());
});
}
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(sysUserDO.getPhone()) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ int i = userDao.isDpcMember(sysUserDO.getPhone(), sysUserDO.getName());
+ if (i>0){
+ loginUserInfoVO.setIsDpcMember(1);
+ }
+ }
return R.ok(loginUserInfoVO);
}
@@ -510,6 +517,13 @@
ComSanshuoExpertVO expertVO=userDao.isExpert(loginUserInfoVO.getPhone());
if (nonNull(expertVO)){
loginUserInfoVO.setType(13);
+ }
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(phone) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ int i = userDao.isDpcMember(phone, sysUserDO.getName());
+ if (i>0){
+ loginUserInfoVO.setIsDpcMember(1);
+ }
}
return R.ok(loginUserInfoVO);
}
@@ -3286,16 +3300,19 @@
@Override
public R updateUserPartyStatus(Long userId) {
- SysUserDO sysUserDO = userDao.selectById(userId);
- if (sysUserDO != null) {
- sysUserDO.setIsPartymember(1);
- int updated = userDao.updateById(sysUserDO);
- if (updated > 0) {
- // 删除用户信息缓存
- String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
- stringRedisTemplate.delete(userKey);
+ List<SysUserDO> sysUserDOs = userDao.selectByUserId(userId);
+ for (SysUserDO sysUserDO : sysUserDOs) {
+ if (sysUserDO != null) {
+ sysUserDO.setIsPartymember(1);
+ int updated = userDao.updateById(sysUserDO);
+ if (updated > 0) {
+ // 删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
}
}
+
return R.ok();
}
--
Gitblit v1.7.1