From 1b8db0473522c886428767f7eeaaf7f52d47ce42 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 15:30:41 +0800
Subject: [PATCH] 1.盘带人级联 2.盘点物品为仓库内物品
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index ea9e566..9489c09 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -9,6 +9,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.TreeMap;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,7 @@
import com.consum.base.pojo.FinSysTenantParam;
import com.consum.base.pojo.FinSysTenantSearchParam;
import com.consum.base.service.FinSysTenantService;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.vo.FinSysTenantUserResult;
@@ -64,7 +65,7 @@
private FinSysTenantService finSysTenantService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
@Autowired
public FinSysTenantController(FinSysTenantService finSysTenantService) {
@@ -81,36 +82,33 @@
private long defaultParentId = 0L;
/**
- * @Description 鑾峰彇鍖哄垝鏍�
+ * @Description 鑾峰彇鏈烘瀯鏍�
* @Author wh
* @Date 2023/7/11 11:15
*/
@GetMapping("/select/tree_fin_tenant")
public ResponseValue listOrgRootTree() {
- List<FinSysTenant> finSysTenantList = null;
- FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
- finSysTenantUser.setSysUserId(this.getCurrentUser().getId());
- List<FinSysTenantUser> finSysTenantUserList = finSysTenantUserService.select(finSysTenantUser);
- FinSysTenantUser user = null; // 绯荤粺鐢ㄦ埛
- FinSysTenant finSysTenant1 = null;
- List<TreeNode> treeRootList = null; // 鏁板垪琛�
- FinSysTenant finSysTenant = new FinSysTenant();
- // 鑾峰彇鍦板尯鐖剁骇
- finSysTenantList = this.finSysTenantService.queryForTree();
- // 鏍规嵁鐧婚檰浜篿d鑾峰彇绯荤粺鐢ㄦ埛锛屽鏋滄湁绯荤粺鐢ㄦ埛鏃�
- if (finSysTenantUserList.size() > 0) {
- // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- user = finSysTenantUserList.get(0);
- String tenantId = user.getTenantId();
- finSysTenant.setId(new Long(tenantId));
- // 鏌ヨ鍖哄煙
- List<FinSysTenant> select = finSysTenantService.select(finSysTenant);
- if (select.size() > 0) {
- finSysTenant1 = select.get(0);
- }
+ // 绯荤粺鐢ㄦ埛
+ FinSysTenantUser user = this.getSysInfo();
+ if (Objects.isNull(user)) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- if (finSysTenant1 != null) {
- if (finSysTenant1.getLv() != 1 && finSysTenant1.getParentId() != 0 && user != null) {
+
+ // 鑾峰彇鎵�鏈夋満鏋�
+ List<FinSysTenant> finSysTenantList = this.finSysTenantService.queryForTree();
+ // 鏍规嵁鐧婚檰浜篿d鑾峰彇绯荤粺鐢ㄦ埛锛屽鏋滄湁绯荤粺鐢ㄦ埛鏃�
+ // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ String tenantId = user.getTenantId();
+ FinSysTenant finSysTenant = new FinSysTenant();
+ finSysTenant.setId(new Long(tenantId));
+ // 涓婚敭鏄疶empId
+ finSysTenant.setTempId(new Long(tenantId));
+ // 鏌ヨ褰撳墠鐢ㄦ埛鐨勬満鏋�
+ FinSysTenant userTenant = finSysTenantService.get(finSysTenant);
+ // 鏍戝垪琛�
+ List<TreeNode> treeRootList;
+ if (userTenant != null) {
+ if (userTenant.getLv() != 1 && userTenant.getParentId() != 0) {
rootMap.clear();
this.childMap.clear();
this.defaultParentId = new Long(user.getTenantId());
@@ -165,11 +163,11 @@
whStr.append(" and parent_id=:parent_id");
paramts.put("parent_id", param.getTenantId());
}
- if (param.getName() != null && !param.getName().equals("")) {
+ if (StringUtils.isNotEmpty(param.getName())) {
whStr.append(" and name like:name");
paramts.put("name", "%" + param.getName() + "%");
}
- if (param.getCode() != null && !param.getCode().equals("")) {
+ if (StringUtils.isNotEmpty(param.getCode())) {
whStr.append(" and code=:code");
paramts.put("code", param.getCode());
}
@@ -326,7 +324,7 @@
StringBuilder whStr = new StringBuilder("where 1=1 and status = 1 and is_delete = 0 ");
HashMap parameter = new HashMap<>();
- if (param.getFirstZmS() != null && !param.getFirstZmS().equals("")) {
+ if (StringUtils.isNotEmpty(param.getFirstZmS())) {
whStr.append(" and name is not null and(");
String upperCase = param.getFirstZmS().toUpperCase();
whStr.append(
@@ -611,17 +609,13 @@
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
String tenantId = sysInfo.getTenantId();
- FinSysTenant finSysTenant = new FinSysTenant();
- finSysTenant.setTempId(Long.valueOf(tenantId));
- FinSysTenant userTenant = this.finSysTenantService.get(finSysTenant);
+ FinSysTenant userTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
Long parentId = userTenant.getParentId();
// 绗竴绾�
if (parentId == 0) {
return ResponseValue.success(userTenant);
} else {
- FinSysTenant param = new FinSysTenant();
- param.setTempId(Long.valueOf(parentId));
- FinSysTenant result = this.finSysTenantService.get(param);
+ FinSysTenant result = finSysTenantService.selectById(parentId);
return ResponseValue.success(result);
}
}
--
Gitblit v1.9.1