Sfoglia il codice sorgente

垫款 初版1.2优化修改

zhaoxian 2 anni fa
parent
commit
56bc79c575

+ 3 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentApplicationMapper.xml

@@ -91,9 +91,9 @@
                  WHERE t1.application_id = #{id}
                  UNION ALL
                  SELECT t1.audit_status,
-                        t1.revieweder_id,
-                        t1.revieweder,
-                        t4.role_name,
+                        IFNULL(t1.revieweder_id, '-'),
+                        IFNULL(t1.revieweder, '-'),
+                        IFNULL(t4.role_name, '-'),
                         t1.approval_content,
                         t1.files,
                         t1.update_time

+ 3 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentRechargeApplicationMapper.xml

@@ -13,9 +13,9 @@
                  WHERE t1.recharge_id = #{id}
                  UNION ALL
                  SELECT t1.audit_status,
-                        t1.revieweder_id,
-                        t1.revieweder,
-                        t4.role_name,
+                        IFNULL(t1.revieweder_id, '-'),
+                        IFNULL(t1.revieweder, '-'),
+                        IFNULL(t4.role_name, '-'),
                         t1.approval_content,
                         t1.files,
                         t1.update_time