Commit 8857c513 by qwmqiuwenmin

fix

parent bde3efeb
...@@ -21,6 +21,8 @@ import com.gic.api.base.commons.Page; ...@@ -21,6 +21,8 @@ import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO; import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkService; import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.base.api.common.BasePageInfo; import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.HaobanResponse; import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.common.utils.PageUtil; import com.gic.haoban.common.utils.PageUtil;
...@@ -70,6 +72,8 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -70,6 +72,8 @@ public class StaffApiServiceImpl implements StaffApiService {
private ClerkService clerkService; private ClerkService clerkService;
@Autowired @Autowired
private com.gic.enterprise.api.service.DepartmentService gicDepartmentService; private com.gic.enterprise.api.service.DepartmentService gicDepartmentService;
@Autowired
private StoreService storeService;
@Override @Override
public StaffDTO selectById(String staffId) { public StaffDTO selectById(String staffId) {
...@@ -312,8 +316,15 @@ public class StaffApiServiceImpl implements StaffApiService { ...@@ -312,8 +316,15 @@ public class StaffApiServiceImpl implements StaffApiService {
if(org.apache.commons.lang3.StringUtils.isNoneBlank(related.getClerkCode())){ if(org.apache.commons.lang3.StringUtils.isNoneBlank(related.getClerkCode())){
if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(oldStaff.getStaffName())){ if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(oldStaff.getStaffName())){
TabHaobanDepartment department = departmentService.selectById(addId); TabHaobanDepartment department = departmentService.selectById(addId);
com.gic.enterprise.api.dto.DepartmentDTO dto = gicDepartmentService.getDeptment(department.getRelatedId()); String enterpriseId = "";
ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(dto.getEnterpriseId(),related.getClerkCode()); if(department.getIsStore() == 0){
com.gic.enterprise.api.dto.DepartmentDTO dto = gicDepartmentService.getDeptment(department.getRelatedId());
enterpriseId = dto.getEnterpriseId();
}else{
StoreDTO store = storeService.getStore(department.getRelatedId());
enterpriseId = store.getEnterpriseId();
}
ClerkDTO clerkDTO= clerkService.getClerkByCodeNoStatus(enterpriseId,related.getClerkCode());
logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO)); logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
clerkDTO.setClerkName(staffDTO.getStaffName()); clerkDTO.setClerkName(staffDTO.getStaffName());
clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber()); clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment