From 5039fb11b2831475ad6d32592b4a4d5a03f0bcfa Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 18:13:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
index e0bf1e5..228d85a 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java
@@ -1,5 +1,15 @@
package com.consum.base.controller;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.pojo.BaseWarehouseParam;
@@ -11,17 +21,10 @@
import com.walker.db.page.GenericPager;
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;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RestController;
/**
* @Description 浠撳簱绠＄悊
@@ -36,7 +39,6 @@
private BaseWarehouseService baseWarehouseService;
@Autowired
private LWhGoodsService lWhGoodsService;
-
/**
* @Description 鏂板
@@ -53,7 +55,7 @@
if (StringUtils.isEmpty(param.getWarehouseName())) {
return ResponseValue.error("浠撳簱鍚嶇О涓虹┖");
}
- //TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
+ // TODO 鍔犳潈闄� 鐪佺骇绠＄悊鍛樺綍鍏ユ墍鏈変粨搴撲俊鎭�
int result = this.baseWarehouseService.add(param);
if (result > 0) {
@@ -74,12 +76,12 @@
CommonUtil.copyProperties(param, param2);
param = param2;
- FinSysTenantUser sysInfo = this.getSysInfo();
- if (sysInfo == null) {
+ FinSysTenantUser currentUser = this.getSysInfo();
+ if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- param.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
- GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
+ param.setAgencyId(Long.valueOf(currentUser.getTenantId()));
+ GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param, currentUser);
return ResponseValue.success(pager);
}
@@ -177,9 +179,8 @@
}
@ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true, dataType = "WarehouseQry", paramType = "query")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "warehouseQry", value = "浠撳簱id鍜屽瀷鍙穒d", required = true,
+ dataType = "WarehouseQry", paramType = "query")})
@GetMapping("/select/number")
public ResponseValue selectNumber() {
WarehouseQry warehouseQry = CommonUtil.getObjFromReq(WarehouseQry.class);
@@ -190,7 +191,8 @@
Long warehouseId = warehouseQry.getWarehouseId();
if (warehouseId == null) {
Long agencyId = warehouseQry.getAgencyId();
- BaseWarehouse defaultWarehouseByAgencyId = this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
+ BaseWarehouse defaultWarehouseByAgencyId =
+ this.baseWarehouseService.getDefaultWarehouseByAgencyId(agencyId);
warehouseId = defaultWarehouseByAgencyId.getId();
}
Long baseGoodsModelsId = warehouseQry.getBaseGoodsModelsId();
@@ -202,6 +204,4 @@
return ResponseValue.success(num);
}
-
}
-
--
Gitblit v1.9.1