yumeng 2 lat temu
rodzic
commit
2e29e5cbc5

+ 15 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -89,7 +89,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             Map<String, Object> requestMap = new HashMap<>();
             if (!Check.isNull(userId)) {
                 String roleId = sysRoleService.getRoleBYUserId(userId);
-                if (!Check.isNull(collectSampleStatus) && !roleId.contains("association")) {
+                if (!Check.isNull(collectSampleStatus)) {
                     if (roleId.equals("courtshipManager") || roleId.equals("bdManager") || roleId.equals("associationManager")) { // 经理层级查看部门下所有数据
                         Long deptId = sysDeptService.getDeptIdByUserId(userId);
                         List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
@@ -103,6 +103,20 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                     } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
                         requestMap.put("itemCreateId", userId);
                     }
+                } else {
+                    if (roleId.equals("courtshipManager") || roleId.equals("bdManager")) { // 经理层级查看部门下所有数据
+                        Long deptId = sysDeptService.getDeptIdByUserId(userId);
+                        List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
+                        if (roleId.equals("bdManager") || roleId.equals("associationManager")) {
+                            requestMap.put("collectSampleIds", userIds);
+                        } else {
+                            requestMap.put("itemCreateIds", userIds);
+                        }
+                    } else if (roleId.equals("bd")) { // 社群和bd查看申请人为自己的领样信息
+                        requestMap.put("collectSampleId", userId);
+                    } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
+                        requestMap.put("itemCreateId", userId);
+                    }
                 }
             }
             if (!Check.isNull(itemId)) {