Browse Source

领样列表全部数据互通

yumeng 2 năm trước cách đây
mục cha
commit
1d7a88ced9

+ 14 - 12
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -87,19 +87,21 @@ public class KuaishouItemCollectSamplesController extends BaseController {
         try {
             Map<String, Object> requestMap = new HashMap<>();
             if (!Check.isNull(userId)) {
-                String roleId = sysRoleService.getRoleBYUserId(userId);
-                if (roleId.equals("courtshipManager") || roleId.equals("bdManager") || roleId.equals("associationManager")) { // 经理层级查看部门下所有数据
-                    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);
+                if (!Check.isNull(collectSampleStatus)) {
+                    String roleId = sysRoleService.getRoleBYUserId(userId);
+                    if (roleId.equals("courtshipManager") || roleId.equals("bdManager") || roleId.equals("associationManager")) { // 经理层级查看部门下所有数据
+                        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("association") || roleId.equals("bd")) { // 社群和bd查看申请人为自己的领样信息
+                        requestMap.put("collectSampleId", userId);
+                    } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
+                        requestMap.put("itemCreateId", userId);
                     }
-                } else if (roleId.equals("association") || roleId.equals("bd")) { // 社群和bd查看申请人为自己的领样信息
-                    requestMap.put("collectSampleId", userId);
-                } else if (roleId.equals("courtship")) { // 招商查看创建人为自己的领样信息
-                    requestMap.put("itemCreateId", userId);
                 }
             }
             if (!Check.isNull(itemId)) {