1

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml

@@ -26,6 +26,8 @@
 		pbe.productProgress,
 		SUM(pbd.unTaxTotalAmount) AS unTaxTotalAmount,
 		SUM(pbd.count) AS countTotal,
+		0 AS enterWareCount,
+		0 AS enterWareAmount,
 		pbe.deliveryCount,
 		pbe.deliveryStateValue,
 		pb.`remarks`,

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java

@@ -29,7 +29,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -77,7 +76,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
         ResultBean rb = ResultBean.fireFail();
         PurchaseBillQuery query = pq.getParams();
         QueryWrapper<PurchaseBill> qw = new QueryWrapper<>();
-        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgLevelKey())) {
+        if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
             //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
             String orgLevelKey=query.getOrgLevelKey();
             String orgSidPath=query.getOrgPath();
@@ -145,7 +144,7 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
         ResultBean rb = ResultBean.fireFail();
         PurchaseBillQuery query = pq.getParams();
         QueryWrapper<PurchaseBill> qw = new QueryWrapper<>();
-        if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgLevelKey())) {
+        if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
             //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
             String orgLevelKey=query.getOrgLevelKey();
             String orgSidPath=query.getOrgPath();