From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 39b3415..c908c31 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
@@ -20,6 +20,8 @@
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
+import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
+import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
//import com.panzhihua.common.service.grid.GridService;
@@ -334,6 +336,17 @@
}
/**
+ * 微心愿搜索社区团队人员列表
+ * @param param 请求参数
+ * @param communityId 社区id
+ * @return 社区团队人员列表
+ */
+ @Override
+ public R listActivityManager2(String param, Long communityId) {
+ return R.ok(userDao.getServiceTeamList(param,communityId));
+ }
+
+ /**
* 分页查询人脸识别
*
* @param loginUserInfoVO 查询参数
@@ -590,17 +603,17 @@
@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.fail();
-// }
+ 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();
+ }
return R.fail();
}
--
Gitblit v1.7.1