Merge branch 'develop' into release_temp

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java

@@ -107,7 +107,7 @@ public class SpecialSubjectController {
      */
     @PostMapping("hot-subject-taglist")
     public Result<List<TagInfoResultDTO>> hotSubjectTagList(@LoginUser TokenDto tokenDto, @RequestBody  HotSubjectTagFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, HotSubjectTagFormDTO.HotSubjectTagGroup.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<List<TagInfoResultDTO>>().ok(specialSubjectService.hotSubjectTagList(formDTO));
     }

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml

@@ -38,7 +38,7 @@
         hc.CONFIGURATION_DESCRIPTION,
         chd.REGION,
         chd.CONFIGURATION,
-        chd.DEMO_DATA,
+        hc.DEMO_DATA,
         chd.DISPLAY_ORDER
     FROM
         (

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -290,6 +290,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 
 		//补充信息更新到党员基本信息表
 		PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO);
+		if (null == partyMemberInfo) {
+			log.warn("partymemberInfoService.getPartyMemberInfo return null,this partyMember maybe have audited,param:{}", JSON.toJSON(infoDTO));
+			return new Result();
+		}
 		infoDTO.setId(partyMemberInfo.getId());
 		partymemberInfoService.updateById(ConvertUtils.sourceToTarget(infoDTO, PartymemberInfoEntity.class));
 		PartymemberConfirmManualDTO partymemberConfirmManualDTO =