From 62b6a7fac3f2acde70b578431147c4a01f19c182 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 15 四月 2024 09:07:05 +0800
Subject: [PATCH] bug修改
---
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
index 62f6b34..b59b416 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java
@@ -14,7 +14,7 @@
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantService;
-import com.consum.base.service.SDictDataServiceImpl;
+import com.consum.base.service.SDictDataService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
@@ -37,7 +37,7 @@
@Autowired
private FinSysTenantService finSysTenantService;
@Autowired
- private SDictDataServiceImpl sDictDataService;
+ private SDictDataService sDictDataService;
/**
* @Description 鏂板
@@ -93,11 +93,11 @@
if (param.getAgencyId() != null) {
Integer lv = currentUser.getLv();
if (lv != 1) {
- sql.append(" and AGENCY_ID =:AGENCY_ID ");
- paramts.put("AGENCY_ID", param.getAgencyId());
+ sql.append(" and AGENCY_ID =:agencyId ");
+ paramts.put("agencyId", param.getAgencyId());
} else {
- sql.append(" and AGENCY_ID like :AGENCY_ID ");
- paramts.put("AGENCY_ID", param.getAgencyId() + StringUtils.CHAR_PERCENT);
+ sql.append(" and AGENCY_ID like :agencyId ");
+ paramts.put("agencyId", param.getAgencyId() + StringUtils.CHAR_PERCENT);
}
}
// 鐘舵��
@@ -162,7 +162,7 @@
* @Date 2023/10/27
*/
@Override
- public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short isDefault, Short states) {
+ public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Integer states) {
StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
HashMap<String, Object> paramts = new HashMap<>();
@@ -171,34 +171,12 @@
sql.append(" and AGENCY_ID =:AGENCY_ID ");
paramts.put("AGENCY_ID", agencyId);
}
- // 鏄惁涓洪粯璁や粨搴�
- if (isDefault != null) {
- sql.append(" and IS_DEFAULT =:isDefault ");
- paramts.put("isDefault", isDefault);
- }
// 鐘舵��
if (states != null) {
sql.append(" and states =:states ");
paramts.put("states", states);
}
return select(sql.toString(), paramts, new BaseWarehouse());
- }
-
- /**
- * 鏍规嵁鏈烘瀯id鏌ヨ榛樿浠撳簱
- *
- * @param agencyId
- * @return
- */
- @Override
- public BaseWarehouse getDefaultWarehouseByAgencyId(Long agencyId) {
- StringBuilder sql =
- new StringBuilder("SELECT * FROM base_warehouse WHERE IS_DEFAULT = 1 and AGENCY_ID =:agencyId ");
- Map<String, Object> param = new HashMap<>();
- param.put("agencyId", agencyId);
- List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
- BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null);
- return baseWarehouse;
}
@Override
--
Gitblit v1.9.1