fix

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

@@ -461,7 +461,8 @@ public class DepartmentContoller extends WebBaseController{
 				String departmentId = departmentAddQO.getDepartmentId();
 				Boolean addFlag = departmentAddQO.getAddFlag();
 				//在部门下新增部门
-				if(addFlag != null && addFlag) {
+				DepartmentDTO oldDepartment = departmentApiService.selectById(departmentId);
+				if(addFlag != null && addFlag && oldDepartment == null) {
 					DepartmentDTO department = new DepartmentDTO();
 					department.setParentDepartmentId(parentId);
 					department.setWxEnterpriseId(dto.getWxEnterpriseId());

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

@@ -137,7 +137,13 @@ public class StaffController extends WebBaseController{
 		if(staff == null) {
 			return resultResponse(HaoBanErrCode.ERR_10006);
 		}
-		
+		String phoneNumber = staffDTO.getPhoneNumber();
+		String nationcode = staffDTO.getNationCode();
+		String wxEnterpriseId = staff.getWxEnterpriseId();
+		StaffDTO old = staffApiService.selectByNationcodeAndPhoneNumber(wxEnterpriseId,nationcode,phoneNumber);
+		if(old != null && !old.getStaffId().equals(staffId)){
+			return resultResponse(HaoBanErrCode.ERR_10005);
+		}
 		staffApiService.staffEdit(staffDTO,departmentIds);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}