|
@@ -299,7 +299,8 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
|
|
String[] strs = date.split("-");
|
|
String[] strs = date.split("-");
|
|
QueryWrapper<TBDing> tbDingQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<TBDing> tbDingQueryWrapper = new QueryWrapper<>();
|
|
tbDingQueryWrapper.lambda().eq(TBDing::getSopNo, tbDingApply.getSopNo())
|
|
tbDingQueryWrapper.lambda().eq(TBDing::getSopNo, tbDingApply.getSopNo())
|
|
- .eq(TBDing::getSignYear, strs[0]).eq(TBDing::getSignDate, strs[1]);
|
|
|
|
|
|
+ .eq(TBDing::getSignYear, strs[0]).eq(TBDing::getSignDate, strs[1])
|
|
|
|
+ .eq(TBDing::getUserId, tbDingApply.getCreateId());
|
|
if (tbDingApply.getType() == InOutTypeEnum.IN) {
|
|
if (tbDingApply.getType() == InOutTypeEnum.IN) {
|
|
tbDingQueryWrapper.lambda().isNull(TBDing::getSignInTime);
|
|
tbDingQueryWrapper.lambda().isNull(TBDing::getSignInTime);
|
|
} else {
|
|
} else {
|