ljy121 1 gadu atpakaļ
vecāks
revīzija
ccf4e5a37e

+ 1 - 1
zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

@@ -245,7 +245,7 @@
         RIGHT JOIN CONTRACT t1 on t2.CONTRACT_ID = t1.ID and t1.ISVALID = 1 and t1.FLOW_STATUS = 90
         LEFT JOIN PROJECT pr ON pr.ID = t1.PROJECT_ID
         <where>
-            t2.ISVALID = 1 and t2.BZ != '冲红'
+            t2.ISVALID = 1 and NVL(t2.BZ,'-1') != '冲红'
             <if test="params != null and params.year != null and params.year != ''">
                 AND TO_CHAR(t2.RETURN_DATE,'YYYY') = #{params.year,jdbcType=VARCHAR}
             </if>

+ 2 - 0
zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/service/ding/DingServiceImpl.java

@@ -83,6 +83,8 @@ public class DingServiceImpl implements DingService{
             dingForms.add(dingForm);
         }
         body.setForm(dingForms);
+        entity.setMessageUrl(oa.getMessageUrl());
+        entity.setPcMessageUrl(oa.getPcMessageUrl());
         BeanUtils.copyProperties(oa.getHead(),head);
         BeanUtils.copyProperties(oa.getBody(),body);
         entity.setHead(head);