Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!372

src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java

@@ -95,7 +95,7 @@ public class SpmkServiceImpl implements SpmkService{
 		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;
 		SpmkApproveSummary sum = null;
 		if(ad != null) {
 		if(ad != null) {
-			sum = SpmkApproveSummary.builder().build().selectOne(new QueryWrapper<SpmkApproveSummary>().lambda().select(SpmkApproveSummary::getEmpNum,SpmkApproveSummary::getSts)
+			sum = SpmkApproveSummary.builder().build().selectOne(new QueryWrapper<SpmkApproveSummary>().lambda().select(SpmkApproveSummary::getId,SpmkApproveSummary::getEmpNum,SpmkApproveSummary::getSts)
 					.eq(SpmkApproveSummary::getId, ad.getApproveSummaryId()));
 					.eq(SpmkApproveSummary::getId, ad.getApproveSummaryId()));
 		}
 		}
 		
 		

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -1805,12 +1805,20 @@ public class YgglController {
 			}
 			}
 			List<YgglMainEmp> ygglMainEmps = empNumsConfirm(orgCode, leaderList);
 			List<YgglMainEmp> ygglMainEmps = empNumsConfirm(orgCode, leaderList);
 //			List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>();
 //			List<LoginerChargeDto> loginerChargeDtos = new ArrayList<LoginerChargeDto>();
+			
+			for (Integer leaderId : leaderList) {
 				for (YgglMainEmp m : ygglMainEmps) {
 				for (YgglMainEmp m : ygglMainEmps) {
+					if(m.getEmpNum() == leaderId) {
 						if (m.getHeadUrl() == null) {
 						if (m.getHeadUrl() == null) {
 							m.setHeadUrl(CommonEnum.NULL_STR.getDesc());
 							m.setHeadUrl(CommonEnum.NULL_STR.getDesc());
 						}
 						}
 						loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl()));
 						loginerChargeDtos.add(new LoginerChargeDto(m.getEmpNum(), m.getName(), m.getHeadUrl()));
 					}
 					}
+				}
+				
+			}
+			
+			
 			Collections.reverse(loginerChargeDtos);
 			Collections.reverse(loginerChargeDtos);
 			return ResultUtil.data(loginerChargeDtos);
 			return ResultUtil.data(loginerChargeDtos);
 		}
 		}