From 0c702ab07c67267f8ff4b4e84c32b8e260728a49 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 17:23:03 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 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 d1bb4c7..5491e34 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;
@@ -50,20 +51,20 @@
"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() != ""'>" +
- "AND c.`name` = #{loginUserInfoVO.name} \n" +
- " </if> " +
- " where u.face_state is not null and u.type=1" +
+ "JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
"<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
- "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 and u.community_id=#{loginUserInfoVO.communityId} " +
+ "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
+ "and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
"<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
- "AND u.phone = #{loginUserInfoVO.phone}" +
+ "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
" </if> " +
" order by u.face_state asc,u.create_at asc " +
"</script>")
@@ -77,23 +78,27 @@
"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.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
- "AND c.`name` = #{loginUserInfoVO.communityName} \n" +
- " </if> " +
- " <where>" +
"<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
- " and u.`name` = #{loginUserInfoVO.name} \n" +
+ " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+ " </if> " +
+ "<if test='loginUserInfoVO.name == null or loginUserInfoVO.name.trim() == ""'>" +
+ "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+ " </if> " +
+ "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
+ "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%') \n" +
+ " </if> " +
+ " where u.community_id=#{loginUserInfoVO.communityId} and u.type=1 " +
+ "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != ""'>" +
+ " and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
"<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
- "AND u.phone = #{loginUserInfoVO.phone}" +
+ "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
" </if> " +
- " </where>" +
"</script>")
IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -102,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" +
@@ -119,13 +126,13 @@
"AND u.community_id = #{administratorsUserVO.communityId} \n" +
" </if> " +
"<if test='administratorsUserVO.name != null and administratorsUserVO.name.trim() != ""'>" +
- "AND u.name = #{administratorsUserVO.name} \n" +
+ "AND u.name like concat (#{administratorsUserVO.name},'%') \n" +
" </if> " +
"<if test='administratorsUserVO.phone != null and administratorsUserVO.phone.trim() != ""'>" +
- "AND u.phone = #{administratorsUserVO.phone}" +
+ "AND u.phone like concat(#{administratorsUserVO.phone},'%') " +
" </if> " +
"<if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != ""'>" +
- "AND u.account = #{administratorsUserVO.account}" +
+ "AND u.account like concat(#{administratorsUserVO.account},'%') " +
" </if> " +
" </where>" +
"</script>")
@@ -213,8 +220,8 @@
"GROUP BY u.community_id)t ORDER BY t.num desc limit 10")
List<DataKanbanDTO> selectCommunityActiveUserOrder();
@Select("SELECT \n" +
- "COUNT(u.user_id)allUser,\n" +
- "COUNT(case when u.is_volunteer=1 then u.user_id else null end )volunteerUser,\n" +
+ "COUNT(DISTINCT u.user_id)allUser,\n" +
+ "(select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,\n" +
"COUNT(case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
"COUNT(h.id)house\n" +
"FROM\n" +
@@ -232,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