支部管理v2bug修改

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

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;
 }

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})

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<PartyBranchInfoResultDTO> queryPartyBranchInfo(@RequestBody PartyBranchIdFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class);
         PartyBranchInfoResultDTO partyBranchInfoResultDTO = partyBranchManageService.queryPartyBranchInfo(formDTO.getPartyBranchId());
         return new Result<PartyBranchInfoResultDTO>().ok(partyBranchInfoResultDTO);
     }
@@ -105,7 +105,7 @@ public class PartyBranchManageController {
      **/
     @PostMapping("/partymember/list")
     public Result<List<PartyMemberInfoResultDTO>> listPartyMember(@RequestBody PartyBranchIdFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,PartyBranchIdFormDTO.AddUserInternalGroup.class);
         List<PartyMemberInfoResultDTO> list=partyBranchManageService.listPartyMember(formDTO.getPartyBranchId());
         return new Result<List<PartyMemberInfoResultDTO>>().ok(list);
     }

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<String> update(@RequestBody PartymemberBaseInfoDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         partymemberBaseInfoService.update(dto);
-        return new Result();
+        return new Result().ok(dto.getId());
     }
 
     @DeleteMapping

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<PartymemberBaseInfoEntit
 	 * @description 根据身份证号查询党员库
 	 * @Date 2020/6/17 23:49
 	 **/
-    PartymemberBaseInfoEntity selectByIdCard(@Param("idCard") String idCard,@Param("id")String id);
+    List<PartymemberBaseInfoEntity> selectByIdCard(@Param("idCard") String idCard,@Param("id")String id);
 
     /**
      * @return java.util.List<com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity>

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<PartymemberB
 			throw new RenException(EpmetErrorCode.IDCARDNO_ERROR.getCode());
 		}
 		//3、身份证不允许重复
-		PartymemberBaseInfoEntity partymemberBaseInfoEntity = baseDao.selectByIdCard(idCardNo, partymemberBaseInfoId);
-		if (null != partymemberBaseInfoEntity) {
+		List<PartymemberBaseInfoEntity> partymemberBaseInfoEntityList = baseDao.selectByIdCard(idCardNo, partymemberBaseInfoId);
+		if (null != partymemberBaseInfoEntityList&&partymemberBaseInfoEntityList.size()>0) {
 			throw new RenException(EpmetErrorCode.IDCARDNO_ALREADY_EXITS.getCode());
 		}
 	}