修改sql

Signed-off-by: tangsong <86121657@qq.com>

cbl-server/src/main/resources/mybatis/mapper/Kcbg.xml

@@ -128,7 +128,7 @@
     <select id="queryInventoryByPage" resultType="com.unis.cbl.common.vo.integratedquery.InventoryQueryVO">
         select * from (
             select
-            nvl2(d.kdmc, d.kdmc, t1.qymc) as sskdmc,
+            if(d.kdmc is not null, d.kdmc, t1.qymc) as sskdmc,
             d.kddm as sskddm,
             (ifnull(xm.fcsl, 0) + ifnull(dg.fcsl, 0) + ifnull(dm.fcsl, 0) + ifnull(xmf.fcsl, 0)) as sjcblkc,
             xm.fcsl as xmsl,
@@ -380,7 +380,7 @@
 
     <select id="queryFoodStocksByPage" resultType="com.unis.cbl.common.vo.integratedquery.InventoryQueryVO">
         select
-            nvl2(kd.kdmc, kd.kdmc, t1.qymc) as sskdmc,
+            nvl2(kd.kdmc is not null, kd.kdmc, t1.qymc) as sskdmc,
             kd.kddm as sskddm,
             (ifnull(xm.fcsl, 0) + ifnull(dg.fcsl, 0) + ifnull(dm.fcsl, 0) + ifnull(xmf.fcsl, 0)) as sjcblkc,
             xm.fcsl xmsl,

cbl-server/src/main/resources/mybatis/mapper/RotateProgressMapper.xml

@@ -36,7 +36,7 @@
         from (
             select
             sskddm, ywlx,
-            dict_code, nvl2(phhds, phhds, lcds) amount
+            dict_code, if(phhds is not null, phhds, lcds) amount
             from (
                 select
                 case when t1.sskddm = '911202245661145255001' then '91120224712876078R001'