From 78863d775246038adc615b037364367f13a2bac0 Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期六, 20 三月 2021 12:56:39 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
index 58c41e7..a6fee95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
@@ -133,7 +133,8 @@
     List<ComMngStructHouseVO> selectUserHouseList(@Param("idCard") String idCard);
 
     @Select("<script> " +
-            "SELECT " +
+            "SELECT * FROM ( "+
+            " SELECT " +
             " t.`name`, " +
             "CASE " +
             " IF " +
@@ -166,7 +167,8 @@
             " IF " +
             "  ( t.old_people = 1, '特服家庭,', '' ), " +
             " IF " +
-            "  ( t.key_personnel = 1, '重点人员,', '' )  " +
+            "  ( t.key_personnel = 1, '重点人员,', '' ),  " +
+            "  IFNULL(t.tags,'')  " +
             " ) tags,  " +
             " t.create_at  as createAt " +
             "FROM " +
@@ -185,10 +187,11 @@
             "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName.trim() != &quot;&quot;'>" +
             "AND t1.`area_name` like concat(#{pageInputUserDTO.areaName},'%')   " +
             " </if> " +
-            "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags.trim() != &quot;&quot;'>" +
-            " and t.tags like concat('%',#{pageInputUserDTO.tags},'%')  " +
-            " </if> " +
             " group by t.id_card "+
+            " ) tt  WHERE 1=1 "+
+            "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags.trim() != &quot;&quot;'>" +
+            " and tt.tags like concat('%',#{pageInputUserDTO.tags},'%')  " +
+            " </if> " +
             "</script>")
     IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
 

--
Gitblit v1.7.1