/epmetuser/icresiuser/icuserstatislist人房概览-人员列表手机号、身份证加密

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>
 	 */

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>

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());