Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -39,4 +39,6 @@ public interface StaffApiService {
 
 	public int countByDepartmentId(String departmentId);
 
+	public void syncGicClerk(String fieldListString);
+
 }

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

@@ -150,7 +150,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 			hr.setMessage("微信端新增失败");
 		}
 		
-		
+		hr.setResult(staffId);
 		
 		return hr;
 	}
@@ -412,4 +412,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 		return EntityUtil.changeEntityByJSON(StaffDTO.class, tab);
 	}
 
+	@Override
+	public void syncGicClerk(String fieldListString) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

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

@@ -536,7 +536,15 @@ public class DepartmentContoller extends WebBaseController{
 					staff.setPhoneNumber(phoneNumber);
 					staff.setSex(clerkListDTO.getClerkGender() == null?null:Integer.parseInt(clerkListDTO.getClerkGender()));
 					staff.setSyncPostionFlag(1);
-					staffApiService.add(staff, departmentId);
+					
+					HaobanResponse hr = staffApiService.add(staff, departmentId);
+					if(hr.getErrorCode() == 1){
+						StaffDepartmentRelatedDTO staffRelated = staffApiService.getDepartmentIdAndStaffId(departmentId, hr.getResult().toString());
+						if(staffRelated != null){
+							staffRelated.setClerkCode(clerkCode);
+							staffDepartmentRelatedApiService.updateById(staffRelated);
+						}
+					}
 				}else{
 					String staffId = staff.getStaffId();
 					List<StaffDepartmentRelatedDTO> relatedList = staffApiService.listStaffDepartmentByStaffId(staffId);