fix

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -660,9 +660,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 				if(departmentIds.startsWith(",")){
 					departmentIds = departmentIds.substring(1,departmentIds.length());
 				}
-//				if(map.get(departmentId) == null){
-//					this.staffEdit(staff, departmentIds);
-//				}
+				if(map.get(departmentId) == null){
+					this.staffEdit(staff, departmentIds);
+				}
 				StaffDepartmentRelatedDTO staffRelated = this.getDepartmentIdAndStaffId(departmentId, staffId);
 				StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code);
 				//如果这个人已经绑定了  先解绑
@@ -671,9 +671,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, isCodeExist));
 				}
 				//如果这个人是未绑定的 则绑定clerk
-				//if(StringUtils.isBlank(staffRelated.getClerkCode())){
-				staffRelated.setClerkCode(code);
-				staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, staffRelated));
+				if(staffRelated != null){
+					staffRelated.setClerkCode(code);
+					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, staffRelated));
+				}
 				
 //				ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(enterpriseId,code);
 //				if(clerkDTO != null && (!clerkDTO.getClerkName().equals(staffName) || !staff.getPhoneNumber().equals(clerkDTO.getPhoneNumber()))){
@@ -683,7 +684,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 //					clerkService.updateClerk(clerkDTO);
 //				}
 				//}
-				this.staffEdit(staff, departmentIds);
+				//this.staffEdit(staff, departmentIds);
 	    	}
 	    }
 	}