|
|
@@ -923,14 +923,11 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
@Override
|
|
|
public AjaxResult userRecordMergeCheck() {
|
|
|
Long userId = SecurityUtils.getUserId();
|
|
|
- UserRecord u=new UserRecord();
|
|
|
- u.setCreateId(userId);
|
|
|
- u.setStatus(1);
|
|
|
- int i = userRecordMapper.checkUserRecord(u);
|
|
|
+ int i = userRecordMapper.checkUserRecord(userId,1);
|
|
|
if (i>0){
|
|
|
return AjaxResult.error("当前用户存在缺卡的考勤,请处理后再提交");
|
|
|
}
|
|
|
- int x = userRecordMapper.checkClockUserRecord(u);
|
|
|
+ int x = userRecordMapper.checkClockUserRecord(userId);
|
|
|
if (x>0){
|
|
|
return AjaxResult.error("当前用户存的考勤存在多打卡,请处理后再提交");
|
|
|
}
|