Merge branch 'dev_wx_msg' into dev_temp

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffBasicInfoFromDTO.java

@@ -16,6 +16,7 @@ public class StaffBasicInfoFromDTO implements Serializable {
 	/**
 	 * 用户ID
 	 */
-	@NotBlank(message = "staffId不能为空")
+	@NotBlank(message = "staffId不能为空", groups = {AddUserInternalGroup.class})
 	String staffId;
+	public interface AddUserInternalGroup {}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -152,8 +152,9 @@ public class StaffController {
 	 * 根据staffId查询用户基本信息
 	 * @author sun
 	 */
-	@PostMapping("staffbasicinfo")
+    @PostMapping("staffbasicinfo")
-	public Result<BasicInfoResultDTO> staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO){
+    public Result<BasicInfoResultDTO> staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO) {
-		return staffService.staffBasicInfo(fromDTO);
+        ValidatorUtils.validateEntity(fromDTO, StaffBasicInfoFromDTO.AddUserInternalGroup.class);
-	}
+        return staffService.staffBasicInfo(fromDTO);
+    }
 }