Browse Source

考勤完成核对BUG修复

anderx 1 year ago
parent
commit
93032d3bd7

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserRecordMapper.java

@@ -33,9 +33,9 @@ public interface UserRecordMapper {
 
     void updateTypeDuration(@Param("userId") Long userId, @Param("type") Integer type);
 
-    int checkUserRecord(UserRecord u);
+    int checkUserRecord(@Param("userId") Long userId, @Param("status") Integer status);
 
-    int checkClockUserRecord(UserRecord u);
+    int checkClockUserRecord(@Param("userId") Long userId);
 
     void userRecordMerge(Long userId);
 

+ 2 - 5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -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("当前用户存的考勤存在多打卡,请处理后再提交");
         }

+ 3 - 3
ruoyi-system/src/main/resources/mapper/UserRecordMapper.xml

@@ -178,11 +178,11 @@
             and a.clock_status = #{clockStatus,jdbcType=INTEGER}
         </if>
     </select>
-    <select id="checkUserRecord" resultType="java.lang.Integer">
+    <select id="checkUserRecord"  resultType="java.lang.Integer">
         select count(*)
         from user_record
-        where create_id = #{userId,jdbcType=BIGINT}
-        and status = #{status,jdbcType=INTEGER}
+        where create_id = #{userId}
+        and status = #{status}
     </select>
     <select id="checkClockUserRecord" resultType="java.lang.Integer">
         select count(*)