From e2d97f3c90a6baa36b9edefe927225da907a27c6 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 10:02:15 +0800
Subject: [PATCH] 去除默认机构默认仓库逻辑
---
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java | 48 +++++-------------------------------------------
1 files changed, 5 insertions(+), 43 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 68e3c76..cd32db8 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
@@ -3,9 +3,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +13,10 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.SDictDataServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.SDictData;
import com.walker.db.page.GenericPager;
@@ -40,9 +35,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private FinSysTenantServiceImpl finSysTenantService;
- @Autowired
- private FinSysTenantDepartmentService departmentService;
+ private FinSysTenantService finSysTenantService;
@Autowired
private SDictDataServiceImpl sDictDataService;
@@ -163,36 +156,13 @@
}
/**
- * @Description 鏍规嵁浠撳簱id鑾峰彇鏈烘瀯鐢ㄦ埛淇℃伅
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/26
- */
- @Override
- public void queryUserList(Long baseWarehouseId) {
- // 1.鏍规嵁浠撳簱id鏌ヨ浠撳簱
- BaseWarehouse baseWarehouse = this.getById(baseWarehouseId);
- if (baseWarehouse != null) {
- Long agencyId = baseWarehouse.getAgencyId();
- String agencyName = baseWarehouse.getAgencyName();
- // 2.鏍规嵁鏈烘瀯id鏌ヨ閮ㄩ棬
- List<FinSysTenantDepartment> list = this.departmentService.getByTenantId(agencyId);
- // 鑾峰彇閮ㄩ棬id
- Set<Long> deptIds = list.stream().map(dept -> dept.getId()).collect(Collectors.toSet());
- // 3.鏍规嵁閮ㄩ棬id鏌ヨ鐢ㄦ埛
- // this.userService.getByDeptIds();
-
- }
-
- }
-
- /**
* @return
* @Description 鏍规嵁鏈烘瀯id鏌ヨ鏈烘瀯浠撳簱
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
@Override
- public List<BaseWarehouse> getByAgencyId(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<>();
@@ -200,11 +170,6 @@
if (agencyId != null) {
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) {
@@ -227,11 +192,8 @@
Map<String, Object> param = new HashMap<>();
param.put("agencyId", agencyId);
List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
- Optional<BaseWarehouse> optional = select.stream().findFirst();
- if (optional.isPresent()) {
- return optional.get();
- }
- return null;
+ BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null);
+ return baseWarehouse;
}
@Override
--
Gitblit v1.9.1