yumeng 2 lat temu
rodzic
commit
20c5f5b5b6

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

@@ -88,21 +88,19 @@ public class KuaishouItemCollectSamplesController extends BaseController {
         try {
             Map<String, Object> requestMap = new HashMap<>();
             if (!Check.isNull(userId)) {
-                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);
+                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);
                 }
             }
             if (!Check.isNull(itemId)) {