Selaa lähdekoodia

政策-政策

yangzian 3 vuotta sitten
vanhempi
commit
93f57ebcec

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyApprovalLogMapper.xml

@@ -24,7 +24,7 @@
         WHERE
             r.role_name = '法务'
           AND l.policy_id = #{policyId}
-          and l.approval_content != null
+          and l.approval_content is NOT NULL
         ORDER BY
             l.create_time DESC
             LIMIT 1
@@ -37,7 +37,7 @@
         select * from ctop_cwjs_policy_approval_log
         where policy_id = #{policyId}
           and approval_status = #{status}
-          and approval_content != null
+          and approval_content is NOT NULL
         order by create_time desc
             LIMIT 1
     </select>

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -55,7 +55,7 @@
         and ((#{policyStartDate} &lt;= t2.policy_start_date and #{policyEndDate} &gt;= t2.policy_start_date)
         or (#{policyStartDate} &gt;= t2.policy_start_date and #{policyStartDate} &lt;= t2.policy_end_date))
         </if>
-        order by t2.create_time DESC, p.id DESC
+        order by t2.create_time DESC, t2.id DESC
     </select>
 
     <select id="getAllSale" resultType="com.alibaba.fastjson.JSONObject">