改bug

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -494,7 +494,6 @@
           AND ri.service_flow = 1
           AND ri.is_deleted = 0
           AND ri.service_flow_id != 7
-          and ri.service_flow_id != 11
         AND father_require_id = 0
         AND repertory > 0
         ORDER BY ri.order_level_amount DESC,
@@ -546,7 +545,7 @@
                  LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
             AND ra.user_account_id = ri.user_account_id
-        WHERE ri.id = #{id} and rs.service_flow_id != 11
+        WHERE ri.id = #{id} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
     <insert id="addPublishService" parameterType="com.mmc.csf.release.entity.requirements.ServiceRequirementsDO"
@@ -650,7 +649,7 @@
         UPDATE requirements_service
         set service_flow_id=#{serviceFlowId},
             update_time=NOW()
-        where requirements_info_id = #{requirementsInfoId} and service_flow_id != 11
+        where requirements_info_id = #{requirementsInfoId} and (service_flow_id != 11 or service_flow_id is NULL)
     </update>
 
     <update id="updateInfo">
@@ -860,7 +859,7 @@
         INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
             #增加的
         LEFT JOIN service_flow sf ON sf.id = rs.service_flow_id
-        WHERE rs.pilot_certification_user_id = #{userAccountId} AND rs.is_deleted !=1 and service_flow_id != 11
+        WHERE rs.pilot_certification_user_id = #{userAccountId} AND rs.is_deleted !=1
         <if test=" requirementsInfoId != null  ">
             and ri.id=#{requirementsInfoId}
         </if>
@@ -960,7 +959,7 @@
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
                  INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
         WHERE rs.pilot_certification_user_id = #{userAccountId}
-          AND rs.requirements_info_id = #{requirementsInfoId} and service_flow_id != 11
+          AND rs.requirements_info_id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
     <select id="customerDroneFlyerCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsServiceDO">
@@ -1004,7 +1003,7 @@
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
                  INNER JOIN requirements_service rs ON ri.id = rs.requirements_info_id
-        WHERE rs.requirements_info_id = #{requirementsInfoId} and rs.service_flow_id != 11
+        WHERE rs.requirements_info_id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
     <select id="publisherCancel" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
@@ -1054,7 +1053,7 @@
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
                  LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
         WHERE ri.user_account_id = #{userAccountId}
-          AND ri.id = #{requirementsInfoId} and rs.service_flow_id != 11
+          AND ri.id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
 
@@ -1104,7 +1103,7 @@
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
                  LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
-        WHERE ri.id = #{requirementsInfoId} and rs.service_flow_id != 11
+        WHERE ri.id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
 
@@ -1154,7 +1153,7 @@
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
                  LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
-        WHERE ri.id = #{requirementsInfoId} and rs.service_flow_id != 11
+        WHERE ri.id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
     <select id="publisherCancelFlyer" resultType="com.mmc.csf.release.entity.requirements.RequirementsInfoDO">
@@ -1203,7 +1202,7 @@
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
                  LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
-        WHERE ri.id = #{requirementsInfoId} and rs.service_flow_id != 11
+        WHERE ri.id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
 
@@ -1252,7 +1251,7 @@
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
                  LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
                  LEFT JOIN requirements_service rs ON rs.requirements_info_id = ri.id
-        WHERE ri.publisher_number = #{publisherNumber} and rs.service_flow_id != 11
+        WHERE ri.publisher_number = #{publisherNumber} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
     <select id="flowDictionary" resultType="com.mmc.csf.release.entity.requirements.FlowDictionaryDO">
@@ -1369,7 +1368,7 @@
     <select id="requirementsServiceDTO" resultMap="resultMap">
         select requirements_info_id, create_time, update_time, service_flow
         from requirements_service
-        where requirements_info_id = #{requirementsInfoId} and service_flow_id != 11
+        where requirements_info_id = #{requirementsInfoId} and (service_flow_id != 11 or service_flow_id is NULL)
     </select>
 
     <select id="serviceArriveSceneDTO" resultMap="resultMapCommon">
@@ -1555,7 +1554,7 @@
                  LEFT JOIN requirements_type rt ON rt.id = ri.requirement_type_id
                  LEFT JOIN service_flow sf ON sf.id = ri.service_flow_id
                  LEFT JOIN requirements_service rs ON ri.id = rs.requirements_info_id
-        WHERE ri.id = #{requirementsInfoId} and rs.service_flow_id != 11
+        WHERE ri.id = #{requirementsInfoId} and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
     </select>
 
     <update id="deletePublishService">
@@ -1568,18 +1567,18 @@
         SELECT count(*)
         FROM requirements_service
         WHERE requirements_info_id = #{requirementsInfoId}
-          AND pilot_certification_user_id = #{userAccountId} and service_flow_id != 11
+          AND pilot_certification_user_id = #{userAccountId} and (service_flow_id != 11 or service_flow_id is NULL)
     </select>
     <update id="deletePreempt">
         update requirements_service
         set is_deleted=1
-        where requirements_info_id = #{requirementsInfoId} and service_flow_id != 11
+        where requirements_info_id = #{requirementsInfoId} and (service_flow_id != 11 or service_flow_id is NULL)
     </update>
 
     <select id="serviceReq" resultType="com.mmc.csf.release.entity.requirements.RequirementsServiceDO">
         select cash_amount, we_chat, salary_amount, wechat_pay_order_number, preempt_total_amount
         from requirements_service
-        where requirements_info_id = #{requirementsInfoId} and service_flow_id != 11
+        where requirements_info_id = #{requirementsInfoId} and (service_flow_id != 11 or service_flow_id is NULL)
     </select>
     <update id="updateRepertory">
         update requirements_info
@@ -1652,7 +1651,7 @@
         LEFT JOIN requirements_amount ra ON ra.requirements_info_id = ri.id
         LEFT JOIN requirements_amount_update rau ON rau.requirements_info_id = ri.id
         left join requirements_service rs on ri.id = rs.requirements_info_id
-        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1 and rs.service_flow_id != 11
+        WHERE ri.user_account_id = #{userAccountId} and ri.is_deleted!=1 and (rs.service_flow_id != 11 or rs.service_flow_id is NULL)
         <if test=" requirementsInfoId != null  ">
             and ri.father_require_id=#{requirementsInfoId}
         </if>