From 76ed3735c23da4b7ef97b8a0f365facbc14f6903 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期日, 27 六月 2021 16:05:03 +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 | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 f346875..c2d369a 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
@@ -1117,8 +1117,9 @@
* @return 协议集合
*/
@Override
- public R listAgreement() {
- List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<>());
+ public R listAgreement(Long communityId) {
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<SysUserAgreementDO>()
+ .eq(SysUserAgreementDO::getCommunityId,communityId));
if (ObjectUtils.isEmpty(sysUserAgreementDOS)) {
return R.fail();
}
@@ -2037,4 +2038,15 @@
userDao.gridMemberEditStatus(gridMemberEditDTO);
return R.ok();
}
+
+ public R noTips(Long userId){
+ SysUserDO userDO = this.userDao.selectById(userId);
+ if(userDO != null){
+ userDO.setBigAgeTips(2);
+ if(this.userDao.updateById(userDO) > 0){
+ return R.ok();
+ }
+ }
+ return R.fail();
+ }
}
--
Gitblit v1.7.1