yumeng 6 月之前
父節點
當前提交
95fa9c8d44

+ 9 - 4
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KwaiXiaoDianReportController.java

@@ -556,11 +556,16 @@ public class KwaiXiaoDianReportController {
 
 
                 requestMap.put("userIds", userIds);
                 requestMap.put("userIds", userIds);
             } else if ("industry_courtship_manager".equals(roleId) || "industry_purchase_manager".equals(roleId)) { // 招商、采购经理角色查看部门下所有成员数据
             } else if ("industry_courtship_manager".equals(roleId) || "industry_purchase_manager".equals(roleId)) { // 招商、采购经理角色查看部门下所有成员数据
-                List<Long> courtshipPurchaseIds = kwaixiaodianItemGetService.getUserIds(userId);
-                if (Check.isNull(courtshipPurchaseIds)) {
-                    throw new Exception("此用户未查询到部门成员信息");
+//                List<Long> courtshipPurchaseIds = kwaixiaodianItemGetService.getUserIds(userId);
+//                if (Check.isNull(courtshipPurchaseIds)) {
+//                    throw new Exception("此用户未查询到部门成员信息");
+//                }
+//                requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
+                companyId = kwaixiaodianItemGetService.getCompanyId(userId);
+                if (Check.isNull(companyId)) {
+                    throw new Exception("此用户未查询到归属公司");
                 }
                 }
-                requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
+                requestMap.put("companyId", companyId);
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
                 List<Long> courtshipPurchaseIds = new ArrayList<>();
                 List<Long> courtshipPurchaseIds = new ArrayList<>();
                 courtshipPurchaseIds.add(userId);
                 courtshipPurchaseIds.add(userId);

+ 17 - 7
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KwaixiaodianItemGetController.java

@@ -341,11 +341,16 @@ public class KwaixiaodianItemGetController extends BaseController {
                 }
                 }
                 requestMap.put("companyId", companyId);
                 requestMap.put("companyId", companyId);
             } else if ("industry_sale_manager".equals(roleId)) { // 销售经理角色查看部门下所有成员数据
             } else if ("industry_sale_manager".equals(roleId)) { // 销售经理角色查看部门下所有成员数据
-                List<Long> userIds = kwaixiaodianItemGetService.getUserIds(userId);
-                if (Check.isNull(userIds)) {
-                    throw new Exception("此用户未查询到部门成员信息");
+//                List<Long> userIds = kwaixiaodianItemGetService.getUserIds(userId);
+//                if (Check.isNull(userIds)) {
+//                    throw new Exception("此用户未查询到部门成员信息");
+//                }
+//                requestMap.put("userIds", userIds);
+                companyId = kwaixiaodianItemGetService.getCompanyId(userId);
+                if (Check.isNull(companyId)) {
+                    throw new Exception("此用户未查询到归属公司");
                 }
                 }
-                requestMap.put("userIds", userIds);
+                requestMap.put("companyId", companyId);
             } else if ("industry_sale".equals(roleId)) { // 销售   查看自己的数据
             } else if ("industry_sale".equals(roleId)) { // 销售   查看自己的数据
                 List<Long> userIds = new ArrayList<>();
                 List<Long> userIds = new ArrayList<>();
                 userIds.add(userId);
                 userIds.add(userId);
@@ -357,9 +362,14 @@ public class KwaixiaodianItemGetController extends BaseController {
                 }
                 }
                 requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
                 requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
             } else if ("industry_purchase".equals(roleId) || "industry_courtship".equals(roleId)) { // 采购 招商 查看自己的数据
-                List<Long> courtshipPurchaseIds = new ArrayList<>();
-                courtshipPurchaseIds.add(userId);
-                requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
+//                List<Long> courtshipPurchaseIds = new ArrayList<>();
+//                courtshipPurchaseIds.add(userId);
+//                requestMap.put("courtshipPurchaseIds", courtshipPurchaseIds);
+                companyId = kwaixiaodianItemGetService.getCompanyId(userId);
+                if (Check.isNull(companyId)) {
+                    throw new Exception("此用户未查询到归属公司");
+                }
+                requestMap.put("companyId", companyId);
             }
             }
 
 
             if (!Check.isNull(shopId)) {
             if (!Check.isNull(shopId)) {