fix

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

@@ -603,17 +603,17 @@ public class StaffApiServiceImpl implements StaffApiService {
 	    		staff.setSex(sex);
 	    		staff.setStaffName(staffName);
 	    		staff.setSyncPostionFlag(1);
+	    		StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code);
+	    		//如果这个code已经绑定了 先解绑
+				if(isCodeExist != null){
+					isCodeExist.setClerkCode(null);
+					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, isCodeExist));
+				}
 	    		HaobanResponse hr = this.add(staff, department.getDepartmentId());
 				if(hr.getErrorCode() == 1){
 					StaffDepartmentRelatedDTO staffRelated = this.getDepartmentIdAndStaffId(departmentId, hr.getResult().toString());
-					StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code);
-					//如果这个code已经绑定了 先解绑
-					if(isCodeExist != null){
-						isCodeExist.setClerkCode(null);
-						staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, isCodeExist));
-					}
 					//绑定
-					if(staffRelated != null && isCodeExist == null){
+					if(staffRelated != null){
 						staffRelated.setClerkCode(code);
 						staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, staffRelated));
 					}
@@ -655,7 +655,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, isCodeExist));
 				}
 				//如果这个人是未绑定的 则绑定clerk
-				if(StringUtils.isBlank(staffRelated.getClerkCode()) && isCodeExist == null){
+				if(StringUtils.isBlank(staffRelated.getClerkCode())){
 					staffRelated.setClerkCode(code);
 					staffDepartmentRelatedMapper.updateByPrimaryKey(EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, staffRelated));