diff --git a/src/main/java/cn/timer/api/controller/crm/CrmController.java b/src/main/java/cn/timer/api/controller/crm/CrmController.java index 7d42e37..9f80ae7 100644 --- a/src/main/java/cn/timer/api/controller/crm/CrmController.java +++ b/src/main/java/cn/timer/api/controller/crm/CrmController.java @@ -251,11 +251,17 @@ public class CrmController { List<Map<String, Object>> managers = new ArrayList<Map<String, Object>>(); for (CrmBusinessGroupMember crmBusinessGroupManager : crmBusinessGroupManagers) { Integer empNum = crmBusinessGroupManager.getEmpNum(); - String name = getEmpName(orgCode, empNum); - Map<String, Object> map = new HashMap<String, Object>(); - map.put("name", name); - map.put("empNum", empNum); - managers.add(map); + + YgglMainEmp emps = YgglMainEmp.builder().build() + .selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, empNum) + .eq(YgglMainEmp::getOrgCode, orgCode).select(YgglMainEmp::getName, YgglMainEmp::getHeadUrl)); + if(emps != null) { + String name = getEmpName(orgCode, empNum); + Map<String, Object> map = new HashMap<String, Object>(); + map.put("name", name); + map.put("empNum", empNum); + managers.add(map); + } } crmBusinessGroup.setManagers(managers); diff --git a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java index 1167f68..f4288fd 100644 --- a/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java +++ b/src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java @@ -16,6 +16,7 @@ import cn.timer.api.bean.spmk.SpmkApprovalTemplate; import cn.timer.api.bean.spmk.SpmkApprovalTemplateG; import cn.timer.api.bean.spmk.SpmkApproveDetail; import cn.timer.api.bean.spmk.SpmkApproveExecuteRecord; +import cn.timer.api.bean.spmk.SpmkApproveSummary; import cn.timer.api.bean.spmk.SpmkCustomApproval; import cn.timer.api.config.annotation.UserBean; import cn.timer.api.controller.zzgl.service.ZzglBmgwMService; @@ -91,6 +92,11 @@ public class SpmkServiceImpl implements SpmkService{ public SpmkApproveDetailDto selectApproveDetailByAsId(Integer asId) { // TODO Auto-generated method stub SpmkApproveDetail ad = spmkApproveDetailMapper.selectOne(new QueryWrapper<SpmkApproveDetail>().lambda().eq(SpmkApproveDetail::getApproveSummaryId, asId)); + SpmkApproveSummary sum = null; + if(ad != null) { + sum = SpmkApproveSummary.builder().id(ad.getApproveSummaryId()).build().selectById(); + } + SpmkApproveDetailDto adD = SpmkApproveDetailDto.builder().build(); if (ad == null) { return null; @@ -102,7 +108,10 @@ public class SpmkServiceImpl implements SpmkService{ adD.setRouter(ObjectUtil.deserialize(ad.getRouter())); adD.setFlowChildren(ObjectUtil.deserialize(ad.getFlowChildren())); adD.setApproveExecuteRecord(listAer); - + if(sum != null) { + adD.setEmpNum(sum.getEmpNum()); + adD.setSts(sum.getSts()); + } return adD; } diff --git a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java index 0a292ae..b949edd 100644 --- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java +++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java @@ -1881,7 +1881,13 @@ public class YgglController { YgglMainEmp.builder().headUrl(modifyavatardto.getAvatar_path()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()) .eq(YgglMainEmp::getEmpNum, userBean.getEmpNum())); + QyzxEmpLogin.builder().headUrl(modifyavatardto.getAvatar_path()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()) + .eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone())); + return ResultUtil.success("上传成功"); } + + + } diff --git a/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java b/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java index 41cd990..4d6f47e 100644 --- a/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java +++ b/src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java @@ -42,5 +42,9 @@ public class SpmkApproveDetailDto { @ApiModelProperty(value = "审批执行记录 ", example = "审批执行记录") private List<SpmkApproveExecuteRecord> approveExecuteRecord; + + private Integer empNum; + + private Integer sts; }