From 2a40c27f2fb7c3c3503b8554ed8ee68873223ccb Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 29 一月 2021 09:49:18 +0800
Subject: [PATCH] 社区动态

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index f0f7215..45ed48f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -9,6 +9,7 @@
 import com.panzhihua.common.model.vos.IndexDataKanbanVO;
 import com.panzhihua.common.model.vos.IndexDataVO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
 import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
 import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
 import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -58,7 +59,7 @@
             "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
             "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
             " </if> " +
-            " where u.face_state is not null and u.type=1" +
+            " where u.face_state is not null and u.type=1 and u.community_id=#{loginUserInfoVO.communityId} " +
             "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
             "and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
             " </if> " +
@@ -91,14 +92,13 @@
             "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
             "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
             " </if> " +
-            " <where>" +
+            " where u.community_id=#{loginUserInfoVO.communityId} " +
             "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
             " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
             " </if> " +
             "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
             "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
             " </if> " +
-            " </where>" +
             "</script>")
     IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
 
@@ -107,8 +107,10 @@
             "u.user_id,\n" +
             "u.account,\n" +
             "u.`name`,\n" +
+            "u.`password`,\n" +
             "u.phone,\n" +
             "e.role_name,\n" +
+            "e.role_id ,\n" +
             "u.`status`,\n" +
             "u.create_at,\n" +
             "u.last_login_time \n" +
@@ -124,13 +126,13 @@
             "AND u.community_id = #{administratorsUserVO.communityId} \n" +
             " </if> " +
             "<if test='administratorsUserVO.name != null and administratorsUserVO.name.trim() != &quot;&quot;'>" +
-            "AND u.name = #{administratorsUserVO.name} \n" +
+            "AND u.name like concat (#{administratorsUserVO.name},'%')  \n" +
             " </if> " +
             "<if test='administratorsUserVO.phone != null and administratorsUserVO.phone.trim() != &quot;&quot;'>" +
-            "AND u.phone = #{administratorsUserVO.phone}" +
+            "AND u.phone like concat(#{administratorsUserVO.phone},'%') " +
             " </if> " +
             "<if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != &quot;&quot;'>" +
-            "AND u.account = #{administratorsUserVO.account}" +
+            "AND u.account like concat(#{administratorsUserVO.account},'%') " +
             " </if> " +
             " </where>" +
             "</script>")
@@ -237,6 +239,10 @@
             "u.continuous_landing_days + 1,\n" +
             "0)")
     int timedTaskContinuousLandingDays();
-    @Select("select state from com_mng_volunteer_mng where phone=#{phone}")
+    @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
     ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
+    @Update("update sys_user set face_state=null where user_id=#{userId}")
+    int updateFaceState(Long userId);
+    @Select("select name from com_act where community_id=#{communityId}")
+    ComActVO selectCommunity(Long communityId);
 }

--
Gitblit v1.7.1