daili 3 роки тому
батько
коміт
404ef6793e

+ 6 - 6
application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -340,22 +340,22 @@
     <select id="getLatestApprovalInfo" resultType="com.factory.web.entity.pm.OnsiteApprovalPlan"><![CDATA[
         SELECT oap.benteler_plan_id,
                oap.approval_level,
-               oap.approval_user_id,
+               a.approval_user_id,
                oap.`status`,
-               oap.reason,
-               oap.updated_time
+               a.reason,
+               a.updated_time
         FROM onsite_approval_plan oap,
              (
-                 SELECT oap.benteler_plan_id,
-                        if(oap.status = 0 and oap.approval_level = 2, 1, MAX(oap.approval_level)) AS approval_level
+                 SELECT oap.*
                  FROM onsite_approval_plan oap
                  WHERE oap.benteler_plan_id = #{req.bentelerPlanId}
                  order by oap.status desc, oap.approval_level desc
                  limit 1
              ) a
         WHERE oap.benteler_plan_id = a.benteler_plan_id
-          AND oap.approval_level = a.approval_level
           AND oap.benteler_plan_id = #{req.bentelerPlanId}
+        order by approval_level desc
+        limit 1
         ]]></select>
 
     <!-- 取得计划下的点检项目数 -->