From e66b132b13fb50dd49361e19932791afc51b53a8 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 17 八月 2021 15:49:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 90568f6..8314900 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
@@ -19,6 +19,8 @@
 import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
 import com.panzhihua.common.model.vos.community.screen.event.EventGridMemberVO;
 import com.panzhihua.common.model.vos.grid.GridMemberVO;
+import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO;
+import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamWishVO;
 import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
 import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
 import com.panzhihua.common.model.vos.user.SysUserVO;
@@ -433,4 +435,12 @@
     @Select("select user_id,nick_name,phone from sys_user where type = 6 and community_id = #{communityId} limit 3")
     List<EventGridMemberVO> getGridsMemberList(@Param("communityId") Long communityId);
 
+    @Select("<script>" +
+            "select id as managerId,`name` from com_pb_service_team where community_id = #{communityId}" +
+            "<if test='param != null and param != &quot;&quot;'>" +
+            "AND `name` like concat(#{param},'%') " +
+            " </if> " +
+            "</script>")
+    List<ComPbServiceTeamWishVO> getServiceTeamList(@Param("param") String param, @Param("communityId") Long communityId);
+
 }

--
Gitblit v1.7.1