## 创建考核月表语句调整；

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml

@@ -34,7 +34,7 @@
         assess_type   NUMBER(2) not null,
         pk_awards     NUMBER(6) default 1 not null,
         assess_target NUMBER(17,6) default 0 not null,
-        assess_pk_awards NUMBER(6) default 1 not null,,
+        assess_pk_awards NUMBER(6) default 1 not null,
         is_examine    NUMBER(1) default 1 not null,
         assess_status NUMBER(2) not null,
         month_balance NUMBER(17,6) default 0 not null,

bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java

@@ -106,6 +106,10 @@ public class SaDeliverUnhandledController extends BaseController {
         param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
         param.setVertexIdList(userAuthorityDTO.getVertexIdList());
         param.setTeamList(userAuthorityDTO.getUserTeamList());
+        // 兼容调换货产品
+        if (CollectionUtil.isEmpty(param.getPkWaresList())) {
+            param.setPkWaresList(Collections.singletonList(0));
+        }
 
         startPage();
         List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
@@ -149,6 +153,10 @@ public class SaDeliverUnhandledController extends BaseController {
         param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
         param.setVertexIdList(userAuthorityDTO.getVertexIdList());
         param.setTeamList(userAuthorityDTO.getUserTeamList());
+        // 兼容调换货产品
+        if (CollectionUtil.isEmpty(param.getPkWaresList())) {
+            param.setPkWaresList(Collections.singletonList(0));
+        }
 
         List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
 

bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml

@@ -119,7 +119,7 @@
             from sa_order so
             where so.del_flag = 0
               and so.order_status = 1
-              and so.order_type in (3, 26, 10)
+              and so.order_type in (3, 14, 26, 10)
               and to_char(so.pay_time, 'yyyy-mm-dd') =
                   to_char(sysdate, 'yyyy-mm-dd')
         ) b on 1 = 1
@@ -141,7 +141,7 @@
             from sa_order so
             where so.del_flag = 0
               and so.order_status = 1
-              and so.order_type in (3, 26, 10)
+              and so.order_type in (3, 14, 26, 10)
               and to_char(so.pay_time, 'yyyy-mm-dd') =
                   to_char(sysdate - 1, 'yyyy-mm-dd')
         ) b on 1 = 1
@@ -165,7 +165,7 @@
             from sa_order so
             where so.del_flag = 0
               and so.order_status = 1
-              and so.order_type in (3, 26, 10)
+              and so.order_type in (3, 14, 26, 10)
               and to_char(so.pay_time, 'yyyy-mm') =
                   to_char(sysdate, 'yyyy-mm')
         ) b on 1 = 1