Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!356

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

@@ -94,7 +94,8 @@ 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().id(ad.getApproveSummaryId()).build().selectById();
+			sum = SpmkApproveSummary.builder().build().selectOne(new QueryWrapper<SpmkApproveSummary>().lambda().select(SpmkApproveSummary::getEmpNum).select(SpmkApproveSummary::getSts)
+					.eq(SpmkApproveSummary::getId, ad.getApproveSummaryId()));
 		}
 		}
 		
 		
 		SpmkApproveDetailDto adD = SpmkApproveDetailDto.builder().build();
 		SpmkApproveDetailDto adD = SpmkApproveDetailDto.builder().build();