Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/util/FlowableService.java

@@ -3,6 +3,7 @@ package com.huyi.service.util;
 import com.alibaba.fastjson.JSON;
 import com.huyi.service.base.service.ISysConfigService;
 import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.ServletUtils;
 import com.tianhu.common.log.annotation.Log;
 import com.tianhu.common.log.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,11 +127,13 @@ public class FlowableService {
 		conn.setRequestMethod("POST");
 		conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
 		conn.setRequestProperty("Content-Length", String.valueOf(postDataBytes.length));
-		if (request != null) {
-			if (request.getHeader("Authorization") != null) {
-				conn.setRequestProperty("Authorization", request.getHeader("Authorization").replace("Bearer ", ""));
-			}
+		if (request == null) {
+			request = ServletUtils.getRequest();
+		}
+		if (request.getHeader("Authorization") != null) {
+			conn.setRequestProperty("Authorization", request.getHeader("Authorization").replace("Bearer ", ""));
 		}
+
 		conn.setDoOutput(true);
 		conn.getOutputStream().write(postDataBytes);
 

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -252,11 +252,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--                and b.zbi_id  NOT IN (${paramMap.billIdList})-->
 <!--            </if>-->
             <if test="paramMap.idList != null  and paramMap.idList != ''">
-                and (b.zbi_id  IN (${paramMap.idList}) or  b.zbi_id  NOT IN (${paramMap.billIdList}))
+                and (b.zbi_id  IN (${paramMap.idList}) or (b.zbi_id  NOT IN (${paramMap.billIdList}) and zbi_status != '99'))
             </if>
             <if test="paramMap.idList == null  or paramMap.idList == ''">
                 <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
                     and b.zbi_id  NOT IN (${paramMap.billIdList})
+                    and zbi_status != '99'
                 </if>
             </if>
             ORDER BY b.create_time DESC
@@ -302,11 +303,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--                and b.zbi_id  NOT IN (${paramMap.billIdList})-->
 <!--            </if>-->
             <if test="paramMap.idList != null  and paramMap.idList != ''">
-                and (b.zbi_id  IN (${paramMap.idList}) or  b.zbi_id  NOT IN (${paramMap.billIdList}))
+                and (b.zbi_id  IN (${paramMap.idList}) or (b.zbi_id  NOT IN (${paramMap.billIdList}) and zbi_status != '99'))
             </if>
             <if test="paramMap.idList == null  or paramMap.idList == ''">
                 <if test="paramMap.billIdList != null  and paramMap.billIdList != ''">
                     and b.zbi_id  NOT IN (${paramMap.billIdList})
+                    and zbi_status != '99'
                 </if>
             </if>
             ORDER BY b.create_time DESC