Browse Source

分管员admin可以看全部,基础资料-商品管理-商品信息 查询添加分管员权限,出口贸易-询价 只能看自己的单子

wangzhuo 2 years ago
parent
commit
9c6cf8affb

+ 7 - 0
blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -199,6 +199,13 @@ public class GoodsDescController extends BladeController {
 			goodsDescLambdaQueryWrapper.and(i -> i.like(GoodsDesc::getArtsVision, artsVision).or().isNull(GoodsDesc::getArtsVision));
 		}
 		goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
+
+		if (!"admin".equals(AuthUtil.getUserName())) {
+			goodsDescLambdaQueryWrapper.and(qw -> qw.like(GoodsDesc::getSupervisorUserIdGroup, AuthUtil.getUserId())
+				.or().isNull(GoodsDesc::getSupervisorUserIdGroup)
+				.or().eq(GoodsDesc::getSupervisorUserIdGroup, ""));
+		}
+
 		Page<GoodsDesc> page = new Page<>(current, size);
 		IPage<GoodsDesc> iPage = goodsDescService.page(page, goodsDescLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(iPage.getRecords())) {

+ 5 - 1
blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -187,7 +187,11 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 
 	@Override
 	public IPage<GoodsDescVO> selectGoods(IPage<GoodsDescVO> page, GoodsDesc goodsDesc) {
-		return page.setRecords(baseMapper.selectGoods(page, goodsDesc, AuthUtil.getUserId()));
+		Long userId = null;
+		if (!"admin".equals(AuthUtil.getUserName())) {
+			userId = AuthUtil.getUserId();
+		}
+		return page.setRecords(baseMapper.selectGoods(page, goodsDesc, userId));
 	}
 
 	@Override

+ 5 - 3
blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -160,9 +160,11 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 
-		lambdaQueryWrapper.and(qw -> qw.like(PriceBank::getSupervisorUserIdGroup, AuthUtil.getUserId())
-										.or().isNull(PriceBank::getSupervisorUserIdGroup)
-										.or().eq(PriceBank::getSupervisorUserIdGroup, ""));
+		if (!"admin".equals(AuthUtil.getUserName())) {
+			lambdaQueryWrapper.and(qw -> qw.like(PriceBank::getSupervisorUserIdGroup, AuthUtil.getUserId())
+				.or().isNull(PriceBank::getSupervisorUserIdGroup)
+				.or().eq(PriceBank::getSupervisorUserIdGroup, ""));
+		}
 
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){

+ 6 - 0
blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/PurchaseEnquiry.java

@@ -30,6 +30,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.mocha.entity.PriceBank;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -128,6 +129,11 @@ public class PurchaseEnquiry  extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryStart()),Order::getPlannedDeliveryDate,order.getPlannedDeliveryStart());//计划交货开始
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()),Order::getPlannedDeliveryDate,order.getPlannedDeliveryEnd());//计划交货结束
 		lambdaQueryWrapper.orderByDesc(Order::getId);
+
+		if (!"admin".equals(AuthUtil.getUserName())) {
+			lambdaQueryWrapper.eq(Order::getCreateUser, AuthUtil.getUserId());
+		}
+
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		String corpIds = "";//客户
 		String belongToCorpIds = "";//销售公司