|
|
@@ -481,10 +481,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else if (in.getAssist()==0){
|
|
|
publicReleaseMapper.updateAssist(in);
|
|
|
in.setAssistProcess(0);
|
|
|
- List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(in.getId());
|
|
|
- for (OutPublicReleaseDetails e : outPublicReleaseDetails) {
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(in.getId(), null, null);
|
|
|
+ for (PublicRelease e : publicReleases) {
|
|
|
if (e.getClockIn()==1){
|
|
|
- throw new BusinessException("该公出已签到,无法取消");
|
|
|
+ throw new BusinessException("该协单公出已打卡,无法取消");
|
|
|
}
|
|
|
}
|
|
|
}
|