From be1b60a1bfc1a4e29053d82c90e2036f9a5817a1 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期日, 24 一月 2021 09:31:55 +0800
Subject: [PATCH] test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 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 d43b417..ff9aa91 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
@@ -50,22 +50,21 @@
             "u.phone,\n" +
             "u.id_card,\n" +
             "u.face_state,\n" +
-            "c.name,\n" +
+            "c.area_name communityName,\n" +
             "u.create_at \n" +
             "FROM\n" +
             "sys_user u\n" +
-            "JOIN com_act c ON u.community_id = c.community_id \n" +
-            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
-            "AND c.`name` = #{loginUserInfoVO.name} \n" +
-            " </if> " +
-            " <where>" +
+            "JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
             "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
-            "and u.`name` = #{loginUserInfoVO.communityName} \n" +
+            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
+            " </if> " +
+            " where u.face_state is not null and u.type=1" +
+            "<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 = #{loginUserInfoVO.phone}" +
+            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
             " </if> " +
-            " </where>" +
             " order by u.face_state asc,u.create_at asc " +
             "</script>")
     IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -78,21 +77,26 @@
             "u.phone,\n" +
             "u.id_card,\n" +
             "u.job,\n" +
-            "c.name,\n" +
+            "c.area_name communityName,\n" +
             "u.tags,\n" +
             "u.create_at \n" +
             "FROM\n" +
             "sys_user u\n" +
-            "LEFT JOIN com_act c ON u.community_id = c.community_id \n" +
+            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
+            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+            " </if> " +
+            "<if test='loginUserInfoVO.name == null or loginUserInfoVO.name.trim() == &quot;&quot;'>" +
+            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+            " </if> " +
             "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
-            "AND c.`name` = #{loginUserInfoVO.communityName} \n" +
+            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
             " </if> " +
             " <where>" +
             "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
-            " and u.`name` = #{loginUserInfoVO.name} \n" +
+            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
             " </if> " +
             "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
-            "AND u.phone = #{loginUserInfoVO.phone}" +
+            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
             " </if> " +
             " </where>" +
             "</script>")
@@ -103,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" +
@@ -120,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>")
@@ -233,6 +239,8 @@
             "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);
 }

--
Gitblit v1.7.1