接口修改

ruoyi-system/src/main/resources/mapper/clock/ClockRecordMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND r.activity_id = #{activityId}
           </if>
          <if test="agentId != null">
-              AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
+              AND e.agent_id = #{agentId}
           </if>
         <if test="employeeName != null and employeeName != ''">
             AND e.employee_name LIKE CONCAT('%', #{employeeName}, '%')
@@ -88,12 +88,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     from tb_clock_record r2
                     LEFT JOIN tb_activity act2 ON r2.activity_id = act2.activity_id
                     LEFT JOIN tb_clock_product_record p2 ON r2.record_id = p2.record_id
+                     LEFT JOIN tb_employee e   ON r2.employee_id = e.employee_id
                     WHERE r2.status = 0
                     <if test="activityId != null">
                         AND  r2.activity_id = #{activityId}
                     </if>
                     <if test="agentId != null">
-                        AND r2.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
+                        AND e.agent_id = #{agentId}
                     </if>
                     AND act2.status = 0
                     AND act2.del_flag = '0'
@@ -104,13 +105,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  FROM tb_clock_record r
                  LEFT JOIN tb_activity act ON r.activity_id = act.activity_id
                  LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
+                 LEFT JOIN tb_employee e   ON r.employee_id = e.employee_id
                  WHERE
                  r.status = 0
                  <if test="activityId != null">
                     AND r.activity_id = #{activityId}
                  </if>
                  <if test="agentId != null">
-                    AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
+                     AND e.agent_id = #{agentId}
                  </if>
                  AND r.employee_id = #{employeeId}
                  AND act.status = 0
@@ -122,14 +124,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tb_clock_record r
         LEFT JOIN tb_activity act ON r.activity_id = act.activity_id
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
+        LEFT JOIN tb_employee e   ON r.employee_id = e.employee_id
         WHERE
             r.status = 0
             AND r.employee_id = #{employeeId}
             <if test="activityId != null">
-                AND  r.activity_id = #{activityId}
+                AND r.activity_id = #{activityId}
             </if>
             <if test="agentId != null">
-                AND r.activity_id in (select activity_id from tb_activity_agent where agent_id = #{agentId})
+                AND e.agent_id = #{agentId}
             </if>
             AND act.status = 0
             AND act.del_flag = '0'