From ac3ee0c313a9eda72270ff3a141345685e3490e3 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期六, 21 八月 2021 18:36:04 +0800
Subject: [PATCH] Merge branch 'zzj' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 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..5074a87 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 查询参数
@@ -396,23 +409,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 +602,7 @@
*/
@Override
public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
+
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
// sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
@@ -609,7 +612,7 @@
//删除用户信息缓存
String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
stringRedisTemplate.delete(userKey);
- return R.ok();
+ return R.ok(sysUserDO);
}
return R.fail();
}
@@ -2248,4 +2251,14 @@
}
return R.fail();
}
+
+ /**
+ * 查询社区后台工作人员列表
+ * @param communityId 社区id
+ * @return 社区后台工作人员列表
+ */
+ @Override
+ public R getUserListByCommunityId(Long communityId){
+ return R.ok(this.userDao.getUserListByCommunityId(communityId));
+ }
}
--
Gitblit v1.7.1