同步处理 死循环处理

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

@@ -390,8 +390,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 		}
 	}
 
-	@Override
-	public void staffEdit(StaffDTO staffDTO, String departmentIds) {
+    private void staffEditDeal(StaffDTO staffDTO, String departmentIds, boolean syncGic) {
         TabHaobanStaff oldStaff = staffMapper.selectByPrimaryKey(staffDTO.getStaffId());
         logger.info("【员工修改】oldStaff={}",JSON.toJSONString(oldStaff));
 		//1、先更新staff
@@ -459,7 +458,8 @@ public class StaffApiServiceImpl implements StaffApiService {
 							}
 							enterpriseId = store.getEnterpriseId();
 						}
-						ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(enterpriseId,related.getClerkCode());
+                        if (!syncGic) {
+                            ClerkDTO clerkDTO = clerkService.getClerkByCodeNoStatus(enterpriseId, related.getClerkCode());
                             //if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(clerkDTO.getStaffName())){
                             logger.info("clerkDto:{}", JSONObject.toJSONString(clerkDTO));
                             String headPic = staffDTO.getHeadImg();
@@ -483,6 +483,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                                 clerkDTO.setClerkGender(staffDTO.getSex().toString());
                                 clerkService.updateClerk(clerkDTO);
                             }
+                        }
                         //}
 					}
 
@@ -538,6 +539,11 @@ public class StaffApiServiceImpl implements StaffApiService {
 	}
 
     @Override
+    public void staffEdit(StaffDTO staffDTO, String departmentIds) {
+        staffEditDeal(staffDTO, departmentIds, false);
+    }
+
+	@Override
 	public void syscGicClerk(String fieldListString) {
 		// TODO Auto-generated method stub
 		
@@ -763,7 +769,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 					departmentIds = departmentIds.substring(1,departmentIds.length());
 				}
 				if(map.get(departmentId) == null){
-					this.staffEdit(staff, departmentIds);
+                    this.staffEditDeal(staff, departmentIds, true);
                 }
                 StaffDepartmentRelatedDTO staffRelated = this.getDepartmentIdAndStaffId(departmentId, staffId);
 				StaffDepartmentRelatedDTO isCodeExist = this.getDepartmentIdAndCode(departmentId,code);
@@ -788,7 +794,7 @@ public class StaffApiServiceImpl implements StaffApiService {
 //					clerkService.updateClerk(clerkDTO);
 //				}
 				//}
-				this.staffEdit(staff, departmentIds);
+                this.staffEditDeal(staff, departmentIds, true);
             }
         }
 	}