From ba8128c3a203b02b21d523695ae4756c85fabc5a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 17 Oct 2022 14:31:35 +0800
Subject: [PATCH] =?UTF-8?q?/epmetuser/icresiuser/icuserstatislist=E4=BA=BA?=
 =?UTF-8?q?=E6=88=BF=E6=A6=82=E8=A7=88-=E4=BA=BA=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=89=8B=E6=9C=BA=E5=8F=B7=E3=80=81=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/GovMenuController.java     |  1 +
 .../src/main/resources/mapper/GovMenuDao.xml        | 13 ++++++++++---
 .../com/epmet/controller/IcResiUserController.java  |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java
index cc94cd91f0..ef763f4a43 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java
@@ -106,6 +106,7 @@ public class GovMenuController {
 
 	/**
 	 * 导航
+	 * +数字社区-系统管理-角色管理配置角色权限，也会调用此接口
 	 * @param tokenDto token
 	 * @return List<GovMenuDTO>
 	 */
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml
index 6bc815e44d..7a005b3c02 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml
@@ -47,9 +47,16 @@
         select t1.*,
         lang.field_value name
         from gov_menu t1
-        INNER join gov_language lang on lang.table_name=#{tableName} and lang.field_name='name' and lang.table_id=t1.id and lang.language=#{language}
-        RIGHT JOIN gov_customer_menu m ON t1.id = m.TABLE_ID
-        where t1.del_flag = 0 AND m.del_flag = 0
+        INNER join gov_language lang
+        on (lang.table_name=#{tableName}
+            and lang.field_name='name'
+            and lang.table_id=t1.id
+            and lang.language=#{language}
+        )
+        RIGHT JOIN gov_customer_menu m
+            ON t1.id = m.TABLE_ID
+        where t1.del_flag = 0
+          AND m.del_flag = 0
         <if test="type != null">
             and t1.type = #{type}
         </if>
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 70c7fd0640..0b2e9ee3f0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -1420,6 +1420,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @Author sun
      * @Description 【人房概览】居民统计数点击查询列表
      **/
+    @MaskResponse(fieldNames = {"mobile", "idCard"},fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     @PostMapping("icuserstatislist")
     public Result<PageData<SearchByNameResultDTO>> icUserStatisList(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());