111

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -326,7 +326,7 @@ public class ClerkController extends WebBaseController{
 	//新增店员
 	@HttpLimit
 	@RequestMapping("/staff-add")
-	public HaobanResponse staffAdd(StaffDTO staffDTO,String storeId,String clerkCode,Integer version) {
+	public HaobanResponse staffAdd(StaffDTO staffDTO,String storeId,String clerkCode,String commitName,Integer version) {
 		
 		String wxEnterpriseId = staffDTO.getWxEnterpriseId();
 		String staffName = staffDTO.getStaffName();
@@ -334,12 +334,9 @@ public class ClerkController extends WebBaseController{
 		String nationcode = staffDTO.getNationCode();
 		String postion = staffDTO.getPostion();
 		Integer sex = staffDTO.getSex();
-		if(StringUtils.isBlank(staffName)) {
+		if(StringUtils.isAnyBlank(staffName,phoneNumber,commitName)) {
 			return resultResponse(HaoBanErrCode.ERR_10004);
 		}
-		if(StringUtils.isBlank(phoneNumber)){
-			return resultResponse(HaoBanErrCode.ERR_10014);
-		}
 		if(!GooglePhoneNumberUtil.checkPhoneNumber(phoneNumber, nationcode)){
 			return resultResponse(HaoBanErrCode.ERR_10012);
 		}
@@ -365,7 +362,7 @@ public class ClerkController extends WebBaseController{
 				//需要审核
 				StaffDTO staff = staffApiService.selectById(staffDTO.getStaffId());
 				AuditDTO audit = new AuditDTO();
-				audit.setCommitStaffName(staffName);
+				audit.setCommitStaffName(commitName);
 				audit.setCommitStaffId(staffDTO.getStaffId());
 				audit.setCommitStaffImg(staff.getHeadImg());
 				audit.setCommitStoreId(storeId);