From 7e5b6e8497a4575395aaa44a175dacdefaa5c166 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期二, 19 十二月 2023 09:19:02 +0800 Subject: [PATCH] 过滤仓库管理员角色显示 --- consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 6 +++--- consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java | 13 ++++++++----- consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java | 2 ++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java index 3de9388..3f5f2d6 100644 --- a/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java +++ b/consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java @@ -1,6 +1,5 @@ package com.consum.base.controller; -import io.swagger.annotations.Api; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -16,10 +15,14 @@ import com.consum.base.pojo.FinSysServerVo; import com.consum.base.service.FinSysServerService; import com.consum.model.po.FinSysServer; +import com.iplatform.model.po.S_role; import com.walker.db.page.GenericPager; import com.walker.infrastructure.utils.DateUtils; import com.walker.infrastructure.utils.NumberGenerator; import com.walker.web.ResponseValue; + +import io.swagger.annotations.Api; + @Api(value = "绯荤粺鏈嶅姟淇℃伅", tags = "绯荤粺鏈嶅姟淇℃伅") @RestController @RequestMapping("/pc/fin/sys/server") @@ -39,7 +42,10 @@ */ @GetMapping("/selectByDataScope") public ResponseValue selectByDataScope(Integer dataScope) { - return ResponseValue.success(finSysServerServiceImpl.getByDataScope(dataScope)); + List<S_role> roleList = finSysServerServiceImpl.getByDataScope(dataScope); + // 杩囨护浠撳簱绠$悊鍛樼殑鏄剧ず + roleList.removeIf(role -> role.getRole_name().equals("浠撳簱绠$悊鍛�")); + return ResponseValue.success(roleList); } /** @@ -122,9 +128,6 @@ if (param == null) { return ResponseValue.error("鍙傛暟涓虹┖"); } -// if(finSysServer.getLvType()!=null) { -// finSysServer.setLv(Long.valueOf(finSysServer.getLvType())); -// } int num = this.finSysServerServiceImpl.save(param); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�"); } diff --git a/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java b/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java index ad262fc..ec851c6 100644 --- a/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java +++ b/consum-base/src/main/java/com/consum/base/pojo/response/FormInventoryGoodsVO.java @@ -20,6 +20,8 @@ private Long whFormInventoryId; + private Long baseGoodsModelId; + private Long baseGoodsTemplateId; @ApiModelProperty(value = "鍟嗗搧妯℃澘鍚嶇О") diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java index 4cf8ab6..1753600 100644 --- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java @@ -350,7 +350,7 @@ formInventoryVO.setWarehouseName(inventory.getWarehouseName()); String sql = - "select bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT " + "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT " + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id " + "where bgt.AGENCY_ID = :agencyId"; HashMap<String, Object> param = new HashMap<>(); @@ -360,8 +360,8 @@ result.forEach(item -> { FormInventoryGoodsVO baseGoodsModels = MapUtils.convertMapToObj(item, FormInventoryGoodsVO.class); List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId)); - int inventoryCount = - this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModels.getId(), 1, null); + int inventoryCount = this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, + baseGoodsModels.getBaseGoodsModelId(), 1, null); baseGoodsModels.setInventoryCount(inventoryCount); goodsVOList.add(baseGoodsModels); }); -- Gitblit v1.9.1