From 18877546c8e7fa36c537fe7f9cfc07e7ac6e7654 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 14:00:05 +0800
Subject: [PATCH] 修改模板下载
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 267 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 163 insertions(+), 104 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 25f650a..ece10af 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
@@ -1,22 +1,16 @@
package com.consum.base.controller;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.exception.ExcelDataConvertException;
-import com.consum.base.BaseController;
-import com.consum.base.pojo.FinSysTenantParam;
-import com.consum.base.pojo.FinSysTenantSearchParam;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
-import com.consum.base.core.utils.FinSysTenantUtils;
-import com.consum.model.po.FinSysTenant;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.vo.FinSysTenantUserResult;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.tree.TreeNode;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.web.ResponseValue;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
@@ -26,13 +20,35 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.util.*;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.exception.ExcelDataConvertException;
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.FinSysTenantUtils;
+import com.consum.base.pojo.FinSysTenantParam;
+import com.consum.base.pojo.FinSysTenantSearchParam;
+import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.model.po.FinSysTenant;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.vo.FinSysTenantUserResult;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.tree.TreeNode;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.web.ResponseValue;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* @Description 鍖哄垝
@@ -120,7 +136,12 @@
* @Date 2023/7/14 13:59
*/
@RequestMapping("/select/list")
- public ResponseValue allocatedList(FinSysTenantSearchParam param) {
+ public ResponseValue allocatedList() {
+ FinSysTenantSearchParam param = CommonUtil.getObjFromReq(FinSysTenantSearchParam.class);
+ FinSysTenantSearchParam param2 = new FinSysTenantSearchParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
FinSysTenantUser sysInfo = getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -164,12 +185,12 @@
// 鐪佽繘鍏� 鏌ヨ 鐪佸拰鍦板競 锛涘湴甯傝繘鍏� 鏌ヨ鑷繁鍦板競
// TODO Long.valueOf(getSysInfo().getTenantId())
FinSysTenant finSysTenant =
- this.finSysTenantService.get(new FinSysTenant(Long.valueOf(getSysInfo().getTenantId())));
+ this.finSysTenantService.get(new FinSysTenant(Long.valueOf(getSysInfo().getTenantId())));
if (finSysTenant.getLv() == 3) {
return ResponseValue.error("鍘垮尯绾у埆鏃犳硶鏌ョ湅");
}
List<FinSysTenant> finSysTenantList =
- this.finSysTenantService.queryTreeById(finSysTenant.getId(), finSysTenant.getLv());
+ this.finSysTenantService.queryTreeById(finSysTenant.getId(), finSysTenant.getLv());
List<TreeNode> treeNodeList = new ArrayList<>();
// 鐪佹煡鏈韩鍙婁互涓� 甯傛煡鏈骇 鍘挎棤鏉冩煡鐪�
if (finSysTenant.getLv() == 1) {
@@ -181,7 +202,7 @@
}
} else {
TreeNode treeNode = new TreeNode(finSysTenantList.get(0).getId(), finSysTenantList.get(0).getName(),
- new ArrayList<>(), finSysTenantList.get(0).getParentId(), finSysTenantList.get(0).getCode());
+ new ArrayList<>(), finSysTenantList.get(0).getParentId(), finSysTenantList.get(0).getCode());
treeNodeList.add(treeNode);
}
return ResponseValue.success(treeNodeList);
@@ -196,12 +217,12 @@
// 鐪佽繘鍏� 鏌ヨ 鐪佸拰鍦板競 锛涘湴甯傝繘鍏� 鏌ヨ鑷繁鍦板競
// TODO Long.valueOf(getSysInfo().getTenantId())
FinSysTenant finSysTenant =
- this.finSysTenantService.get(new FinSysTenant(Long.valueOf(getSysInfo().getTenantId())));
+ this.finSysTenantService.get(new FinSysTenant(Long.valueOf(getSysInfo().getTenantId())));
if (finSysTenant.getLv() == 3) {
return ResponseValue.error("鍘垮尯绾у埆鏃犳硶鏌ョ湅");
}
Map<Long, List<FinSysTenant>> finSysTenantList =
- this.finSysTenantService.queryCountyByCityCode(finSysTenant.getId(), finSysTenant.getLv());
+ this.finSysTenantService.queryCountyByCityCode(finSysTenant.getId(), finSysTenant.getLv());
return ResponseValue.success(finSysTenantList);
}
@@ -213,7 +234,7 @@
while (var3.hasNext()) {
Object obj = var3.next();
- node = this.toTreeNode((FinSysTenant) obj);
+ node = this.toTreeNode((FinSysTenant)obj);
if (node.getId() == this.defaultParentId) {
this.rootMap.put(node.getId(), node);
@@ -233,7 +254,7 @@
var3 = this.rootMap.values().iterator();
while (var3.hasNext()) {
- TreeNode n = (TreeNode) var3.next();
+ TreeNode n = (TreeNode)var3.next();
n.setParentId(this.defaultParentId);
this.dummyRoot.addChild(n);
}
@@ -248,16 +269,16 @@
Iterator i = childMap.values().iterator();
while (i.hasNext()) {
- _node = (TreeNode) i.next();
+ _node = (TreeNode)i.next();
this.mountMiddleNode(_node, childMap);
}
}
private void mountMiddleNode(TreeNode currentNode, Map<Long, TreeNode> childMap) {
- TreeNode _parentNode = (TreeNode) this.rootMap.get(currentNode.getParentId());
+ TreeNode _parentNode = (TreeNode)this.rootMap.get(currentNode.getParentId());
if (_parentNode == null) {
- _parentNode = (TreeNode) childMap.get(currentNode.getId());
+ _parentNode = (TreeNode)childMap.get(currentNode.getId());
if (_parentNode == null) {
throw new NullPointerException("parent node not found, current: " + currentNode);
}
@@ -272,7 +293,7 @@
protected TreeNode toTreeNode(FinSysTenant entity) {
TreeNode treeNode =
- new TreeNode(entity.getId(), entity.getName(), (List) null, entity.getParentId(), entity.getCode());
+ new TreeNode(entity.getId(), entity.getName(), (List)null, entity.getParentId(), entity.getCode());
return treeNode;
}
@@ -284,7 +305,7 @@
Iterator var2 = this.rootMap.values().iterator();
while (var2.hasNext()) {
- TreeNode node = (TreeNode) var2.next();
+ TreeNode node = (TreeNode)var2.next();
list.add(node);
}
return list;
@@ -295,13 +316,19 @@
* @Description 涓嶅垎椤垫煡璇�
*/
@RequestMapping("/select/allList")
- public ResponseValue allList(FinSysTenantSearchParam param) {
+ public ResponseValue allList() {
+ FinSysTenantSearchParam param = CommonUtil.getObjFromReq(FinSysTenantSearchParam.class);
+ FinSysTenantSearchParam param2 = new FinSysTenantSearchParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
StringBuilder whStr = new StringBuilder("where 1=1 and status = 1 and is_delete = 0 ");
- HashMap parameter = new HashMap<>();
+ HashMap parameter = new HashMap<>();
if (param.getFirstZmS() != null && !param.getFirstZmS().equals("")) {
whStr.append(" and name is not null and(");
String upperCase = param.getFirstZmS().toUpperCase();
- whStr.append("instr(:upperFirstZmS,F_PINYIN( SUBSTR(name, 1, 1)))>0 or instr(:upperFirstZmS2,SUBSTR(name, 1, 1))>0");
+ whStr.append(
+ "instr(:upperFirstZmS,F_PINYIN( SUBSTR(name, 1, 1)))>0 or instr(:upperFirstZmS2,SUBSTR(name, 1, 1))>0");
parameter.put("upperFirstZmS", upperCase);
parameter.put("upperFirstZmS2", upperCase);
whStr.append(")");
@@ -311,28 +338,39 @@
return ResponseValue.success(select);
}
-
/**
* 鍒犻櫎
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
@PostMapping("/del")
- public ResponseValue del(@RequestBody FinSysTenantParam param) {
+ public ResponseValue del() {
+ FinSysTenantParam param = CommonUtil.getObjFromReqBody(FinSysTenantParam.class);
+ FinSysTenantParam finSysTenantParam = new FinSysTenantParam();
+ CommonUtil.copyProperties(param, finSysTenantParam);
+ param = finSysTenantParam;
+
if (param.getId() == null) {
return ResponseValue.error("鏈烘瀯id涓虹┖");
}
- int num =this.finSysTenantService.updateById(param,this.getSysInfo());
- return num>0 ? ResponseValue.success(1):ResponseValue.error("鍒犻櫎澶辫触锛�");
+ int num = this.finSysTenantService.updateById(param, this.getSysInfo());
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鍒犻櫎澶辫触锛�");
}
/**
* 娣诲姞鏈烘瀯
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/4
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody FinSysTenantParam param){
+ public ResponseValue add() {
+ FinSysTenantParam param = CommonUtil.getObjFromReqBody(FinSysTenantParam.class);
+ FinSysTenantParam finSysTenantParam = new FinSysTenantParam();
+ CommonUtil.copyProperties(param, finSysTenantParam);
+ param = finSysTenantParam;
+
if (param == null) {
return ResponseValue.error("鍙傛暟涓虹┖");
}
@@ -342,7 +380,7 @@
if (StringUtils.isEmpty(param.getName())) {
return ResponseValue.error("鏈烘瀯鍚嶇О涓虹┖");
}
- FinSysTenant finSysTenant = this.finSysTenantService.selectByTenantId(param.getCode());
+ FinSysTenant finSysTenant = this.finSysTenantService.queryOneByCode(param.getCode());
if (finSysTenant != null) {
return ResponseValue.error("鏈烘瀯缂栧彿宸插瓨鍦�");
}
@@ -351,65 +389,44 @@
if (lv > 4) {
return ResponseValue.error("涓嶈兘鍒涘缓鏀眬浠ヤ笅鏈烘瀯");
}
- int num = this.finSysTenantService.addFinSysTenant(param,this.getSysInfo(),lv);
- if(num>0) return ResponseValue.success(1);
+ int num = this.finSysTenantService.addFinSysTenant(param, this.getSysInfo(), lv);
+ if (num > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鎻掑叆澶辫触锛�");
}
@GetMapping("getImportTemplate")
- public ResponseEntity<InputStreamResource> getImportTemplate() throws IOException {
+ public ResponseEntity<InputStreamResource> getImportTemplate(String type) throws IOException {
// 浠庡綋鍓嶉」鐩祫婧愮洰褰曡幏鍙栨枃浠�
- Resource resource = new ClassPathResource("import/鏈烘瀯瀵煎叆妯℃澘.xls");
+ String fileName = null;
+ if ("tenant".equals(type)) {
+ fileName = "鏈烘瀯瀵煎叆妯℃澘.xls";
+ } else if ("goods".equals(type)) {
+ fileName = "鐗╁搧淇℃伅.xls";
+ }
+ Resource resource = new ClassPathResource("import/" + fileName);
// 鑾峰彇鏂囦欢杈撳叆娴�
InputStream inputStream = resource.getInputStream();
// 璁剧疆HTTP鍝嶅簲澶�
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
- String encodedFilename = URLEncoder.encode("鏈烘瀯瀵煎叆妯℃澘.xls", "UTF-8");
+ String encodedFilename = URLEncoder.encode(fileName, "UTF-8");
headers.setContentDispositionFormData("attachment", encodedFilename);
// 鍒涘缓InputStreamResource瀵硅薄锛屽皢鏂囦欢杈撳叆娴佸寘瑁呰捣鏉�
InputStreamResource resourceToDownload = new InputStreamResource(inputStream);
// 杩斿洖甯︽湁鏂囦欢杈撳叆娴佺殑ResponseEntity瀵硅薄
- return ResponseEntity
- .status(HttpStatus.OK)
- .headers(headers)
- .body(resourceToDownload);
+ return ResponseEntity.status(HttpStatus.OK).headers(headers).body(resourceToDownload);
}
-
-
- /**
- * @return 鑾峰彇椤圭洰瀵煎叆鐨勬ā鏉�
- * @throws IOException
- */
- @GetMapping("getProjectImportTemplate")
- public ResponseEntity<InputStreamResource> getProjectImportTemplate() throws IOException {
- // 浠庡綋鍓嶉」鐩祫婧愮洰褰曡幏鍙栨枃浠�
- Resource resource = new ClassPathResource("import/椤圭洰瀵煎叆妯℃澘.xls");
- // 鑾峰彇鏂囦欢杈撳叆娴�
- InputStream inputStream = resource.getInputStream();
- // 璁剧疆HTTP鍝嶅簲澶�
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
- String encodedFilename = URLEncoder.encode("椤圭洰瀵煎叆妯℃澘.xls", "UTF-8");
- headers.setContentDispositionFormData("attachment", encodedFilename);
- // 鍒涘缓InputStreamResource瀵硅薄锛屽皢鏂囦欢杈撳叆娴佸寘瑁呰捣鏉�
- InputStreamResource resourceToDownload = new InputStreamResource(inputStream);
- // 杩斿洖甯︽湁鏂囦欢杈撳叆娴佺殑ResponseEntity瀵硅薄
- return ResponseEntity
- .status(HttpStatus.OK)
- .headers(headers)
- .body(resourceToDownload);
- }
-
@PostMapping("import")
public ResponseValue upload(@RequestParam Long pid, MultipartFile file) throws IOException {
String originalFilename = file.getOriginalFilename();
- if (!"xls".equals(originalFilename.substring(originalFilename.lastIndexOf(".") + 1))){
+ if (!"xls".equals(originalFilename.substring(originalFilename.lastIndexOf(".") + 1))) {
return ResponseValue.error("鏂囦欢鏍煎紡鏈夎!");
}
FinSysTenantUser sysInfo = this.getSysInfo();
- if (sysInfo==null){
+ if (sysInfo == null) {
return ResponseValue.error("褰撳墠鐧诲綍鐢ㄦ埛涓虹┖");
}
String parentIdStr = pid + "";
@@ -420,17 +437,21 @@
EasyExcel.read(file.getInputStream(), FinSysTenantParam.class, new AnalysisEventListener<FinSysTenantParam>() {
LinkedList<FinSysTenantParam> finSysTenantParams = new LinkedList<>();
+
@Override
public void invoke(FinSysTenantParam finSysTenantParam, AnalysisContext analysisContext) {
- if (StringUtils.isEmpty(finSysTenantParam.getCode())||finSysTenantParam.getCode().length()>20){
- IllegalStateException exception = new IllegalStateException("绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯缂栧彿涓嶈兘涓虹┖鎴栭暱搴﹀ぇ浜�20");
+ if (StringUtils.isEmpty(finSysTenantParam.getCode()) || finSysTenantParam.getCode().length() > 20) {
+ IllegalStateException exception = new IllegalStateException(
+ "绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯缂栧彿涓嶈兘涓虹┖鎴栭暱搴﹀ぇ浜�20");
throw exception;
}
- if (null!=finSysTenantService.selectByTenantId(finSysTenantParam.getCode())){
- throw new IllegalStateException("绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯缂栧彿宸插瓨鍦�");
+ if (null != finSysTenantService.queryOneByCode(finSysTenantParam.getCode())) {
+ throw new IllegalStateException(
+ "绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯缂栧彿宸插瓨鍦�");
}
- if (StringUtils.isEmpty(finSysTenantParam.getName())||finSysTenantParam.getName().length()>100){
- IllegalStateException exception = new IllegalStateException("绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯鍚嶇О涓嶈兘涓虹┖鎴栭暱搴﹀ぇ浜�100");
+ if (StringUtils.isEmpty(finSysTenantParam.getName()) || finSysTenantParam.getName().length() > 100) {
+ IllegalStateException exception = new IllegalStateException(
+ "绗�" + analysisContext.readSheetHolder().getRowIndex() + "琛�,鏈烘瀯鍚嶇О涓嶈兘涓虹┖鎴栭暱搴﹀ぇ浜�100");
throw exception;
}
finSysTenantParam.setParentId(pid);
@@ -438,9 +459,10 @@
finSysTenantParam.setSummary("绯荤粺瀵煎叆");
finSysTenantParams.add(finSysTenantParam);
}
+
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
- finSysTenantService.insertFinSysTenantBatch(finSysTenantParams,sysInfo,lv);
+ finSysTenantService.insertFinSysTenantBatch(finSysTenantParams, sysInfo, lv);
}
@Override
@@ -448,11 +470,14 @@
// 濡傛灉鏄煇涓�涓崟鍏冩牸鐨勮浆鎹㈠紓甯� 鑳借幏鍙栧埌鍏蜂綋琛屽彿
if (exception instanceof ExcelDataConvertException) {
ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
- logger.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}",excelDataConvertException.getRowIndex(),
- excelDataConvertException.getColumnIndex()+1, excelDataConvertException.getCellData().getStringValue());
- throw new IllegalStateException("绗�"+(excelDataConvertException.getRowIndex()+1)+"琛岋紝绗�"+(excelDataConvertException.getColumnIndex()+1)+"鍒楄В鏋愬紓甯�,寮傚父鏁版嵁涓�:[ "+excelDataConvertException.getCellData().getStringValue()+" ]");
+ logger.error("绗瑊}琛岋紝绗瑊}鍒楄В鏋愬紓甯革紝鏁版嵁涓�:{}", excelDataConvertException.getRowIndex(),
+ excelDataConvertException.getColumnIndex() + 1,
+ excelDataConvertException.getCellData().getStringValue());
+ throw new IllegalStateException("绗�" + (excelDataConvertException.getRowIndex() + 1) + "琛岋紝绗�"
+ + (excelDataConvertException.getColumnIndex() + 1) + "鍒楄В鏋愬紓甯�,寮傚父鏁版嵁涓�:[ "
+ + excelDataConvertException.getCellData().getStringValue() + " ]");
}
- if (exception instanceof IllegalStateException){
+ if (exception instanceof IllegalStateException) {
throw (IllegalStateException)exception;
}
@@ -460,17 +485,23 @@
}).doReadAll();
- return ResponseValue.success("瀵煎叆鎴愬姛!",1);
+ return ResponseValue.success("瀵煎叆鎴愬姛!", 1);
}
/**
* 缂栬緫
+ *
* @author 鍗㈠簡闃�
* @date 2023/10/6
*/
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody FinSysTenant finSysTenant) {
- Long id = finSysTenant.getId();
+ public ResponseValue edit() {
+ FinSysTenant param = CommonUtil.getObjFromReqBody(FinSysTenant.class);
+ FinSysTenant finSysTenant = new FinSysTenant();
+ CommonUtil.copyProperties(param, finSysTenant);
+ param = finSysTenant;
+
+ Long id = param.getId();
if (id == null || id.longValue() <= 0) {
return ResponseValue.error("缂栬緫鐨勬満鏋勪笉瀛樺湪");
}
@@ -478,12 +509,12 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- // FinSysTenant finSysTenant1 = this.finSysTenantService.selectByTenantId(sysInfo.getTenantCode());
-// if (finSysTenant1.getLv() != 1) {
-// return ResponseValue.error("鏆傛棤淇敼鏉冮檺");
-// }
- int num = this.finSysTenantService.updateFinSysTenant(finSysTenant,this.getSysInfo());
- return num>0 ? ResponseValue.success(1):ResponseValue.error("缂栬緫澶辫触锛�");
+ // FinSysTenant finSysTenant1 = this.finSysTenantService.selectByTenantId(sysInfo.getTenantCode());
+ // if (finSysTenant1.getLv() != 1) {
+ // return ResponseValue.error("鏆傛棤淇敼鏉冮檺");
+ // }
+ int num = this.finSysTenantService.updateFinSysTenant(param, this.getSysInfo());
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
/**
@@ -522,7 +553,8 @@
}
// 鐪�
FinSysTenant finSysTenant1 = this.finSysTenantService.get(new FinSysTenant(finSysTenant.getParentId()));
- List<FinSysTenantUser> finSysTenantUserList = this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
+ List<FinSysTenantUser> finSysTenantUserList =
+ this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
if (!StringUtils.isEmptyList(finSysTenantUserList)) {
FinSysTenantUserResult finSysTenantUserResult = new FinSysTenantUserResult();
finSysTenantUserResult.setOrgId(finSysTenant1.getId());
@@ -543,7 +575,8 @@
}
// 甯�
FinSysTenant finSysTenant2 = this.finSysTenantService.get(new FinSysTenant(finSysTenant.getParentId()));
- List<FinSysTenantUser> finSysTenantUserList2 = this.finSysTenantUserService.getByOrgId(finSysTenant2.getId());
+ List<FinSysTenantUser> finSysTenantUserList2 =
+ this.finSysTenantUserService.getByOrgId(finSysTenant2.getId());
if (!StringUtils.isEmptyList(finSysTenantUserList2)) {
FinSysTenantUserResult finSysTenantUserResult = new FinSysTenantUserResult();
finSysTenantUserResult.setOrgId(finSysTenant2.getId());
@@ -553,7 +586,8 @@
}
// 鐪�
FinSysTenant finSysTenant1 = this.finSysTenantService.get(new FinSysTenant(finSysTenant2.getParentId()));
- List<FinSysTenantUser> finSysTenantUserList = this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
+ List<FinSysTenantUser> finSysTenantUserList =
+ this.finSysTenantUserService.getByOrgId(finSysTenant1.getId());
if (!StringUtils.isEmptyList(finSysTenantUserList)) {
FinSysTenantUserResult finSysTenantUserResult = new FinSysTenantUserResult();
finSysTenantUserResult.setOrgId(finSysTenant1.getId());
@@ -564,4 +598,29 @@
}
return ResponseValue.success(finSysTenantUserResults);
}
+
+ @ApiOperation(value = "鑾峰彇鐖剁骇鏈烘瀯", notes = "鑾峰彇鐖剁骇鏈烘瀯")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "token", dataType = "String", paramType = "header"),})
+ @GetMapping("/get/parent/tenant")
+ public ResponseValue getParentTenant() {
+ FinSysTenantUser sysInfo = getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ String tenantId = sysInfo.getTenantId();
+ FinSysTenant finSysTenant = new FinSysTenant();
+ finSysTenant.setTempId(Long.valueOf(tenantId));
+ FinSysTenant userTenant = this.finSysTenantService.get(finSysTenant);
+ 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);
+ return ResponseValue.success(result);
+ }
+ }
}
--
Gitblit v1.9.1