Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!355

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -251,12 +251,18 @@ public class CrmController {
 				List<Map<String, Object>> managers = new ArrayList<Map<String, Object>>();
 				List<Map<String, Object>> managers = new ArrayList<Map<String, Object>>();
 				for (CrmBusinessGroupMember crmBusinessGroupManager : crmBusinessGroupManagers) {
 				for (CrmBusinessGroupMember crmBusinessGroupManager : crmBusinessGroupManagers) {
 					Integer empNum = crmBusinessGroupManager.getEmpNum();
 					Integer empNum = crmBusinessGroupManager.getEmpNum();
+					
+					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);
 						String name = getEmpName(orgCode, empNum);
 						Map<String, Object> map = new HashMap<String, Object>();
 						Map<String, Object> map = new HashMap<String, Object>();
 						map.put("name", name);
 						map.put("name", name);
 						map.put("empNum", empNum);
 						map.put("empNum", empNum);
 						managers.add(map);
 						managers.add(map);
 					}
 					}
+				}
 				crmBusinessGroup.setManagers(managers);
 				crmBusinessGroup.setManagers(managers);
 
 
 				List<Map<String, Object>> members = new ArrayList<Map<String, Object>>();
 				List<Map<String, Object>> members = new ArrayList<Map<String, Object>>();

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.SpmkApprovalTemplateG;
 import cn.timer.api.bean.spmk.SpmkApproveDetail;
 import cn.timer.api.bean.spmk.SpmkApproveDetail;
 import cn.timer.api.bean.spmk.SpmkApproveExecuteRecord;
 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.bean.spmk.SpmkCustomApproval;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
 import cn.timer.api.controller.zzgl.service.ZzglBmgwMService;
@@ -91,6 +92,11 @@ public class SpmkServiceImpl implements SpmkService{
 	public SpmkApproveDetailDto selectApproveDetailByAsId(Integer asId) {
 	public SpmkApproveDetailDto selectApproveDetailByAsId(Integer asId) {
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
 		SpmkApproveDetail ad = spmkApproveDetailMapper.selectOne(new QueryWrapper<SpmkApproveDetail>().lambda().eq(SpmkApproveDetail::getApproveSummaryId, asId));
 		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();
 		SpmkApproveDetailDto adD = SpmkApproveDetailDto.builder().build();
 		if (ad == null) {
 		if (ad == null) {
 			return null;
 			return null;
@@ -102,7 +108,10 @@ public class SpmkServiceImpl implements SpmkService{
 		adD.setRouter(ObjectUtil.deserialize(ad.getRouter()));
 		adD.setRouter(ObjectUtil.deserialize(ad.getRouter()));
 		adD.setFlowChildren(ObjectUtil.deserialize(ad.getFlowChildren()));
 		adD.setFlowChildren(ObjectUtil.deserialize(ad.getFlowChildren()));
 		adD.setApproveExecuteRecord(listAer);
 		adD.setApproveExecuteRecord(listAer);
-		
+		if(sum != null) {
+			adD.setEmpNum(sum.getEmpNum());
+			adD.setSts(sum.getSts());
+		}
 		return adD;
 		return adD;
 	}
 	}
 
 

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())
 		YgglMainEmp.builder().headUrl(modifyavatardto.getAvatar_path()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
 				.eq(YgglMainEmp::getEmpNum, userBean.getEmpNum()));
 				.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("上传成功");
 		return ResultUtil.success("上传成功");
 	}
 	}
 	
 	
+	
+	
+	
 }
 }

src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java

@@ -43,4 +43,8 @@ public class SpmkApproveDetailDto {
 	@ApiModelProperty(value = "审批执行记录 ", example = "审批执行记录")
 	@ApiModelProperty(value = "审批执行记录 ", example = "审批执行记录")
 	private List<SpmkApproveExecuteRecord> approveExecuteRecord;
 	private List<SpmkApproveExecuteRecord> approveExecuteRecord;
 	
 	
+	private Integer empNum;
+	
+	private Integer sts;
+
 }
 }