fix

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

@@ -378,32 +378,32 @@ public class StaffApiServiceImpl implements StaffApiService {
 					logger.info("【员工修改】related={}",JSON.toJSONString(related));
 					if(org.apache.commons.lang3.StringUtils.isNotBlank(related.getClerkCode())){
 						logger.info("【员工修改】oldName={},name={},oldPhoneNumber={},phoneNumber={}",oldStaff.getStaffName(),staffDTO.getStaffName(),related.getPhoneNumber(),staffDTO.getPhoneNumber());
-						if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(oldStaff.getStaffName())){
-							logger.info("【员工修复】-------------------");
-							TabHaobanDepartment department = departmentService.selectById(addId);
-							String enterpriseId = "";
-							if(department.getIsStore() == 0){
-								com.gic.enterprise.api.dto.DepartmentDTO dto = gicDepartmentService.getDeptment(department.getRelatedId());
-								if(dto == null){
-									StoreGroupDTO group = storeGroupService.getStoreGroupById(department.getRelatedId());
-									if(group != null){
-										enterpriseId = group.getEnterpriseId();
-									}
-								}else{
-									enterpriseId = dto.getEnterpriseId();
+						logger.info("【员工修复】-------------------");
+						TabHaobanDepartment department = departmentService.selectById(addId);
+						String enterpriseId = "";
+						if(department.getIsStore() == 0){
+							com.gic.enterprise.api.dto.DepartmentDTO dto = gicDepartmentService.getDeptment(department.getRelatedId());
+							if(dto == null){
+								StoreGroupDTO group = storeGroupService.getStoreGroupById(department.getRelatedId());
+								if(group != null){
+									enterpriseId = group.getEnterpriseId();
 								}
 							}else{
-								StoreDTO store = storeService.getStore(department.getRelatedId());
-								enterpriseId = store.getEnterpriseId();
-							}
-							ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(enterpriseId,related.getClerkCode());
-							if(clerkDTO != null && (!clerkDTO.getClerkName().equals(staffName) || !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber()))){
-								logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
-								clerkDTO.setClerkName(staffDTO.getStaffName());
-								clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
-								clerkService.updateClerk(clerkDTO);
+								enterpriseId = dto.getEnterpriseId();
 							}
+						}else{
+							StoreDTO store = storeService.getStore(department.getRelatedId());
+							enterpriseId = store.getEnterpriseId();
+						}
+						ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(enterpriseId,related.getClerkCode());
+						//if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(clerkDTO.getStaffName())){
+						if(clerkDTO != null && (!clerkDTO.getClerkName().equals(staffName) || !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber()))){
+							logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
+							clerkDTO.setClerkName(staffDTO.getStaffName());
+							clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
+							clerkService.updateClerk(clerkDTO);
 						}
+						//}
 					}
 
 				}