业务项目过滤

sp-admin/sa-view/tb-partner/tb-partner-add.html

@@ -47,7 +47,7 @@
 								</el-select>
 							</div>
 							<div class="c-item">
-								<label class="c-label">业务项：</label>
+								<label class="c-label">业务录入权限：</label>
 								<el-select v-model="businessType" multiple :disabled="currentCustomerId!=='1'">
 									<el-option v-for="good in goodsList" :key="good.id"
 											   :label="good.name" :value="good.id">

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomerController.java

@@ -144,10 +144,20 @@ public class TbCostomerController {
 
 
     @RequestMapping("getCurrentCustomerId")
-    public AjaxJson getCurrentCustomer() {
+    public AjaxJson getCurrentCustomerId() {
         String id = StpUserUtil.getCustomerId();
         return AjaxJson.getSuccessData(id);
     }
+    @RequestMapping("getCurrentCustomer")
+    public AjaxJson getCurrentCustomer() {
+        String id = StpUserUtil.getCustomerId();
+        if (StrUtil.equals(id,UserTypeEnum.PLATFORM_ADMIN.getCustomerId())){
+            TbCostomer tbCostomer=new TbCostomer();
+            tbCostomer.setId(id);
+            return AjaxJson.getSuccessData(tbCostomer);
+        }
+        return AjaxJson.getSuccessData(tbCostomerService.getById(id));
+    }
 
     @RequestMapping("judge")
     @SaCheckPermission(TbCostomer.PERMISSION_CODE)

sp-server/src/main/java/com/pj/project/tb_goods/TbGoodsController.java

@@ -2,9 +2,13 @@ package com.pj.project.tb_goods;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.util.StrUtil;
+import com.pj.constants.UserTypeEnum;
 import com.pj.project.relation_goods_type.RelationGoodsType;
+import com.pj.project.tb_costomer.TbCostomer;
+import com.pj.project.tb_costomer.TbCostomerService;
 import com.pj.project.tb_item_type.TbItemType;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +21,8 @@ import com.pj.project4sp.SP;
 import com.pj.current.satoken.StpUserUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
+import javax.annotation.Resource;
+
 
 /**
  * Controller: tb_goods -- 商品管理
@@ -32,6 +38,8 @@ public class TbGoodsController {
      */
     @Autowired
     TbGoodsService tbGoodsService;
+    @Resource
+    private TbCostomerService tbCostomerService;
 
     /**
      * 增
@@ -81,6 +89,12 @@ public class TbGoodsController {
     public AjaxJson getList() {
         SoMap so = SoMap.getRequestSoMap();
         List<TbGoods> list = tbGoodsService.getList(so.startPage());
+        String id = StpUserUtil.getCustomerId();
+        if (StrUtil.equals(id, UserTypeEnum.PLATFORM_ADMIN.getCustomerId())){
+            return AjaxJson.getPageData(so.getDataCount(), list);
+        }
+       TbCostomer tbCostomer= tbCostomerService.getById(id);
+        list=  list.stream().filter(tbGoods -> StrUtil.splitTrim(tbCostomer.getBusinessType(),",").contains(tbGoods.getId())).collect(Collectors.toList());
         return AjaxJson.getPageData(so.getDataCount(), list);
     }