Merge remote-tracking branch 'origin/dev_tmdata' into dev_tmdata

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java

@@ -252,7 +252,7 @@ public class IcPartyMemberController implements ResultDataResolver {
     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.result.PartyMemberAgeResultDTO>>
     */
     @PostMapping("partymemberagelist")
-    @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE})
+    @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
     public Result<PageData<PartyMemberAgeResultDTO>> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) {
         if(StringUtils.isBlank(formDTO.getOrgId())){
             IcPartyOrgEntity org = setOrgId(tokenDto);
@@ -272,7 +272,7 @@ public class IcPartyMemberController implements ResultDataResolver {
     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData<com.epmet.dto.result.PartyMemberEducationResultDTO>>
     */
     @PostMapping("partymembereducationlist")
-    @MaskResponse(fieldNames = {"name","mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE})
+    @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
     public Result<PageData<PartyMemberEducationResultDTO>> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) {
         if(StringUtils.isBlank(formDTO.getOrgId())){
             IcPartyOrgEntity org = setOrgId(tokenDto);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -421,7 +421,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @author yinzuomei
      * @date 2021/10/28 10:29 上午
      */
-    @MaskResponse(fieldNames = {"NAME", "MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
+    @MaskResponse(fieldNames = {"MOBILE","ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     @PostMapping("detail")
     public Result queryIcResiDetail(@LoginUser TokenDto tokenDto, @RequestBody IcResiDetailFormDTO pageFormDTO) {
         //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
@@ -755,7 +755,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @author zxc
      * @date 2021/11/3 9:21 上午
      */
-    @MaskResponse(fieldNames = {"name", "mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE})
+    @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE})
     @PostMapping("persondata")
     public Result<PersonDataResultDTO> personData(@LoginUser TokenDto tokenDto, @RequestBody PersonDataFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
@@ -785,7 +785,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @param tokenDto
      * @return 根据分类搜索
      */
-    @MaskResponse(fieldNames = {"name", "mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
+    @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD})
     @PostMapping("searchbycategory")
     public Result<PageData<SearchByNameResultDTO>> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
@@ -1045,7 +1045,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @param resiUserId
      * @return
      */
-    @MaskResponse(fieldNames = {"icUserName","mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_CHINESE_NAME,MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD})
+    @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD})
     @PostMapping("resi-brief/{resi-user-id}")
     public Result<IcResiUserBriefDTO> getResiBrief(@PathVariable("resi-user-id") String resiUserId, @LoginUser TokenDto loginUser) {
         String customerId = loginUser.getCustomerId();