From f845f4ed26c0b7b02dcb8ebab6948bcc1a62eb45 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Mon, 4 Nov 2024 08:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E7=B1=BB=E5=9E=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/u8c/Encapsulation/entity/EncapsulationEntity.xml     | 3 +--
 .../u8c/Encapsulation/service/impl/EncapsulationImpl.java      | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml
index edf4ae46..51c91685 100644
--- a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml
+++ b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/entity/EncapsulationEntity.xml
@@ -12,12 +12,11 @@
         WHERE
         h.cgeneralhid in (
         SELECT cgeneralhid FROM ic_general_b WHERE vfirstbillcode = #{code}
-        <if test="type != null and type != ''"> and csourcetype = #{type} </if>
+        <if test="type != null and type != ''"> and csourcetype = #{type} </if> and dr = '0'
         )
         <if test="cbilltypecode != null and cbilltypecode != ''"> and h.cbilltypecode = #{cbilltypecode} </if>
         group by h.vbillcode,a.unitcode
     </select>
 
-
 </mapper>
 
diff --git a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
index 7efbce26..9ba924c7 100644
--- a/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
+++ b/service/src/main/java/com/hzya/frame/u8c/Encapsulation/service/impl/EncapsulationImpl.java
@@ -9,7 +9,6 @@ import com.hzya.frame.sysnew.application.entity.SysApplicationEntity;
 import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
 import com.hzya.frame.u8c.Encapsulation.dao.IEncapsulationDao;
 import com.hzya.frame.u8c.Encapsulation.entity.EncapsulationEntity;
-import com.hzya.frame.u8c.Encapsulation.service.IEncapsulationService;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;