安全检查 定时任务生成 计划查询重复

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -301,6 +301,7 @@
     </select>
     <select id="selectByCycle" resultType="com.xunmei.core.safetyCheck.domain.CoreSafecheckPlan">
         SELECT
+        DISTINCT
         p.*
         FROM
         core_safecheck_plan p
@@ -314,7 +315,7 @@
         <if test="cycle != null and cycle!=''">
             and p.plan_cycle=#{cycle}
         </if>
-        and ( o1.type = 3
+        and ( o1.type = 3 OR p.exec_org_type IN (1,2)
         OR o2.type IN (
         1,
         2