From a6039dd43de890a85d3586c044a23378b12cca02 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 27 一月 2021 13:49:59 +0800
Subject: [PATCH] 随手拍
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 1694453..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() != ""'>" +
"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() != ""'>" +
"and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
@@ -91,14 +92,13 @@
"<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != ""'>" +
"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() != ""'>" +
" and u.`name` like concat(#{loginUserInfoVO.name},'%') \n" +
" </if> " +
"<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" +
"AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
" </if> " +
- " </where>" +
"</script>")
IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
@@ -239,8 +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