From c61d4e4aef58a162d26dee9f011ba59a15ba6d69 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期二, 29 六月 2021 15:15:20 +0800
Subject: [PATCH] 综治后台增加系统配置接口

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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..41bd4a4 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();
         }
@@ -1156,7 +1157,7 @@
      */
     @Override
     public R listComMngUserTag(Long communityId) {
-        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId, communityId));
+        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().or().lambda().eq(ComMngUserTagDO::getSysFlag,1).or().eq(ComMngUserTagDO::getCommunityId, communityId));
         if (ObjectUtils.isEmpty(comMngUserTagDOS)) {
             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