@@ -968,6 +968,8 @@ public class SysUserServiceImpl implements ISysUserService
userRecordMapper.userRecordMerge(userId);
//清楚考勤合并数据
userRecordMapper.deleteByUserId(userId);
+ //直接补数据
+
return AjaxResult.success(String.format("导入数据未匹配%s条,完成匹配%s条.", unmatched,matched));
}
@@ -182,7 +182,7 @@
select count(*)
from user_record
where create_id = #{userId}
- and status = #{status} and clock_status in (0,1)
+ and status = #{status}
</select>
<select id="checkClockUserRecord" resultType="java.lang.Integer">