diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index dbd4c2f6d8..e12787cc3b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -95,7 +95,7 @@ public enum EpmetErrorCode { return epmetErrorCodeEnum.getMsg(); } } - return null; + return EpmetErrorCode.SERVER_ERROR.getMsg(); } public int getCode(){ diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java index 5009842a2c..1849a8481b 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/PartyBranchIdFormDTO.java @@ -14,10 +14,11 @@ import java.io.Serializable; @Data public class PartyBranchIdFormDTO implements Serializable { private static final long serialVersionUID = 5321430865413383354L; - + public interface AddUserInternalGroup { + } /** * 党支部id */ - @NotBlank(message = "党支部id不能为空") + @NotBlank(message = "党支部id不能为空",groups = {AddUserInternalGroup.class}) private String partyBranchId; } diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java index 999cfd34b1..3414805602 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/SaveOrUpdateParyMemberFormDTO.java @@ -16,10 +16,10 @@ import java.io.Serializable; public class SaveOrUpdateParyMemberFormDTO implements Serializable { private static final long serialVersionUID = -6896349967046364830L; - public interface UpdatePatyMemberGroup extends CustomerClientShowGroup { + public interface UpdatePatyMemberGroup { } - public interface SavePatyMemberGroup extends CustomerClientShowGroup { + public interface SavePatyMemberGroup { } public interface AddUserShowGroup extends CustomerClientShowGroup { @@ -31,10 +31,10 @@ public class SaveOrUpdateParyMemberFormDTO implements Serializable { @NotBlank(message = "姓名不能为空", groups = {AddUserShowGroup.class}) private String name; - @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class}) private String idCard; - @NotBlank(message = "身份证不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) private String mobile; @NotBlank(message = "党员id不能为空", groups = {UpdatePatyMemberGroup.class}) diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java index 74fb00d27c..477aac3df7 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java @@ -91,7 +91,7 @@ public class PartyBranchManageController { **/ @PostMapping("info") public Result queryPartyBranchInfo(@RequestBody PartyBranchIdFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class); PartyBranchInfoResultDTO partyBranchInfoResultDTO = partyBranchManageService.queryPartyBranchInfo(formDTO.getPartyBranchId()); return new Result().ok(partyBranchInfoResultDTO); } @@ -105,7 +105,7 @@ public class PartyBranchManageController { **/ @PostMapping("/partymember/list") public Result> listPartyMember(@RequestBody PartyBranchIdFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class); List list=partyBranchManageService.listPartyMember(formDTO.getPartyBranchId()); return new Result>().ok(list); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java index 7595e5d6c5..1c8c521963 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java @@ -76,11 +76,11 @@ public class PartymemberBaseInfoController { } @PutMapping - public Result update(@RequestBody PartymemberBaseInfoDTO dto){ + public Result update(@RequestBody PartymemberBaseInfoDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); partymemberBaseInfoService.update(dto); - return new Result(); + return new Result().ok(dto.getId()); } @DeleteMapping diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java index d4a8931124..161745918e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java @@ -87,7 +87,7 @@ public interface PartymemberBaseInfoDao extends BaseDao selectByIdCard(@Param("idCard") String idCard,@Param("id")String id); /** * @return java.util.List diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java index 67c26fcbf6..e1e498c555 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java @@ -152,8 +152,8 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl partymemberBaseInfoEntityList = baseDao.selectByIdCard(idCardNo, partymemberBaseInfoId); + if (null != partymemberBaseInfoEntityList&&partymemberBaseInfoEntityList.size()>0) { throw new RenException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode()); } }