合作伙伴看到所有申报和消杀

sp-server/src/main/java/com/pj/project/tb_declare/TbDeclareController.java

@@ -98,7 +98,10 @@ public class TbDeclareController {
         SoMap so = SoMap.getRequestSoMap();
         String currentCustomerId = StpUserUtil.getCustomerId();
         if (!currentCustomerId.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
-            so.put("customerId", currentCustomerId);
+            TbCostomer tbCostomer = tbCostomerService.getById(currentCustomerId);
+            if (tbCostomer.getType().equals(TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
+                so.put("customerId", currentCustomerId);
+            }
         }
         List<TbDeclare> list = tbDeclareService.getList(so.startPage());
         return AjaxJson.getPageData(so.getDataCount(), list);
@@ -113,8 +116,8 @@ public class TbDeclareController {
         String customerId = StpUserUtil.getAdmin().getCustomerId();
         if (!StrUtil.equals(customerId, UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
             TbCostomer tbCostomer = tbCostomerService.getById(customerId);
-            if (tbCostomer.getType().equals(TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())){
-                so.put("customerId",customerId);
+            if (tbCostomer.getType().equals(TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
+                so.put("customerId", customerId);
             }
         }
         List<TbDeclare> list = tbDeclareService.getList(so.startPage());

sp-server/src/main/java/com/pj/project/tb_disinfect/TbDisinfectController.java

@@ -3,6 +3,8 @@ package com.pj.project.tb_disinfect;
 import java.util.List;
 
 import com.pj.constants.UserTypeEnum;
+import com.pj.project.tb_costomer.TbCostomer;
+import com.pj.project.tb_costomer.TbCostomerService;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,6 +16,8 @@ import com.pj.project4sp.SP;
 import com.pj.current.satoken.StpUserUtil;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 
+import javax.annotation.Resource;
+
 
 /**
  * Controller: tb_disinfect -- 消毒申请单
@@ -26,6 +30,8 @@ public class TbDisinfectController {
 	/** 底层 Service 对象 */
 	@Autowired
 	TbDisinfectService tbDisinfectService;
+	@Resource
+	private TbCostomerService tbCostomerService;
 
 	/** 增 */  
 	@RequestMapping("add")
@@ -75,7 +81,10 @@ public class TbDisinfectController {
 		SoMap so = SoMap.getRequestSoMap();
         String currentCustomerId = StpUserUtil.getCustomerId();
         if (!currentCustomerId.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
-            so.put("customerId", currentCustomerId);
+			TbCostomer tbCostomer = tbCostomerService.getById(currentCustomerId);
+			if (tbCostomer.getType().equals(TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
+				so.put("customerId", currentCustomerId);
+			}
         }
 		List<TbDisinfect> list = tbDisinfectService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
@@ -83,6 +92,13 @@ public class TbDisinfectController {
     @RequestMapping("export/disinfect")
     public AjaxJson exportDisinfect() throws Exception{
         SoMap so = SoMap.getRequestSoMap();
+		String currentCustomerId = StpUserUtil.getCustomerId();
+		if (!currentCustomerId.equals(UserTypeEnum.PLATFORM_ADMIN.getCustomerId())) {
+			TbCostomer tbCostomer = tbCostomerService.getById(currentCustomerId);
+			if (tbCostomer.getType().equals(TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
+				so.put("customerId", currentCustomerId);
+			}
+		}
 	    return AjaxJson.getSuccessData(tbDisinfectService.exportDisinfect(so));
     }