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

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 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 4dd3947..58c41e7 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
@@ -83,7 +83,7 @@
             " END AS sex, " +
             " t.phone, " +
             " YEAR ( now( ) ) - YEAR ( substring( t.id_card, 7, 8 ) ) age, " +
-            " t1.area_name, " +
+            " t1.area_name as areaName, " +
             " t.political_outlook politicalOutlook, " +
             " CONCAT( " +
             " IF " +
@@ -96,7 +96,8 @@
             "  ( t.old_people = 1, '特服家庭,', '' ), " +
             " IF " +
             "  ( t.key_personnel = 1, '重点人员,', '' )  " +
-            " ) tags  " +
+            " ) tags,  " +
+            " t.create_at  as createAt " +
             "FROM " +
             " sys_user_input t " +
             " LEFT JOIN com_mng_struct_area t1 ON t.area_id = t1.id  " +
@@ -108,8 +109,8 @@
             "<if test='pageInputUserDTO.phone != null and pageInputUserDTO.phone.trim() != &quot;&quot;'>" +
             " and t.phone like concat(#{pageInputUserDTO.phone},'%')  " +
             " </if> " +
-            "<if test='pageInputUserDTO.areaId != null and pageInputUserDTO.areaId.trim() != &quot;&quot;'>" +
-            " and t.area_id = #{pageInputUserDTO.areaId}  " +
+            "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName.trim() != &quot;&quot;'>" +
+            "AND t1.`area_name` like concat(#{pageInputUserDTO.areaName},'%')   " +
             " </if> " +
             " group by t.id_card "+
             "</script>")
@@ -153,7 +154,7 @@
             " END AS sex, " +
             " t.phone, " +
             " YEAR ( now( ) ) - YEAR ( substring( t.id_card, 7, 8 ) ) age, " +
-            " t1.area_name, " +
+            " t1.area_name as areaName, " +
             " t.political_outlook politicalOutlook, " +
             " CONCAT( " +
             " IF " +
@@ -166,7 +167,8 @@
             "  ( t.old_people = 1, '特服家庭,', '' ), " +
             " IF " +
             "  ( t.key_personnel = 1, '重点人员,', '' )  " +
-            " ) tags  " +
+            " ) tags,  " +
+            " t.create_at  as createAt " +
             "FROM " +
             " sys_user_input t " +
             " LEFT JOIN com_mng_struct_area t1 ON t.area_id = t1.id  " +
@@ -181,7 +183,7 @@
             " and t.phone like concat(#{pageInputUserDTO.phone},'%')  " +
             " </if> " +
             "<if test='pageInputUserDTO.areaName != null and pageInputUserDTO.areaName.trim() != &quot;&quot;'>" +
-            "AND t.`area_name` like concat(#{pageInputUserDTO.areaName},'%')   " +
+            "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},'%')  " +

--
Gitblit v1.7.1