From 9905c212893c1799fa192a1941af30b9a3e16f7a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 16 八月 2021 17:33:10 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |   75 +++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 37 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 c5b6c75..90568f6 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
@@ -11,6 +11,7 @@
 import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
 import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
 import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
+import com.panzhihua.common.model.vos.AppletUserInfoVO;
 import com.panzhihua.common.model.vos.IndexDataKanbanVO;
 import com.panzhihua.common.model.vos.IndexDataVO;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -78,43 +79,43 @@
             "</script>")
     IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
 
-    @Select("<script> " +
-            "SELECT\n" +
-            "u.user_id,\n" +
-            "u.`name`,\n" +
-            "u.`sex`,\n" +
-            "u.nick_name,\n" +
-            "u.phone,\n" +
-            "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n"+
-            "1 isRegister,\n"+
-            "v.political_face political_outlook,\n"+
-            "u.id_card,\n" +
-            "u.job,\n" +
-            "c.area_name communityName,\n" +
-            "u.tags,\n" +
-            "u.create_at \n" +
-            "FROM\n" +
-            "sys_user u\n" +
-            "left join com_mng_volunteer_mng v on u.phone=v.phone \n"+
-            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
-            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
-            " </if> " +
-            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.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.`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() != &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> " +
-            " order by u.user_id desc " +
-            "</script>")
-    IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);
+//    @Select("<script> " +
+//            "SELECT\n" +
+//            "u.user_id,\n" +
+//            "u.`name`,\n" +
+//            "u.`sex`,\n" +
+//            "u.nick_name,\n" +
+//            "u.phone,\n" +
+//            "YEAR (now()) - YEAR (substring(u.id_card, 7, 8)) age,\n"+
+//            "1 isRegister,\n"+
+//            "v.political_face political_outlook,\n"+
+//            "u.id_card,\n" +
+//            "u.job,\n" +
+//            "c.area_name communityName,\n" +
+//            "u.tags,\n" +
+//            "u.create_at \n" +
+//            "FROM\n" +
+//            "sys_user u\n" +
+//            "left join com_mng_volunteer_mng v on u.phone=v.phone \n"+
+//            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
+//            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
+//            " </if> " +
+//            "<if test='loginUserInfoVO.communityName == null or loginUserInfoVO.communityName.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.`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() != &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> " +
+//            " order by u.user_id desc " +
+//            "</script>")
+    IPage<AppletUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") AppletUserInfoVO userInfoVO);
 
     @Select("<script> " +
             "SELECT\n" +

--
Gitblit v1.7.1