|
@@ -89,18 +89,20 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
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) && !roleId.contains("association")) {
|
|
|
+ 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)) {
|
|
@@ -149,18 +151,17 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
|
|
|
|
|
|
@GetMapping("/getUserList")
|
|
|
- public JSONObject getUserList(Long userId){
|
|
|
+ public JSONObject getUserList(Long userId) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
|
List<JSONObject> userIds = sysDeptService.getUserListByDeptId(deptId);
|
|
|
- returnJson.put("code",0);
|
|
|
- returnJson.put("message","查询成功");
|
|
|
- returnJson.put("data",userIds);
|
|
|
+ returnJson.put("code", 0);
|
|
|
+ returnJson.put("message", "查询成功");
|
|
|
+ returnJson.put("data", userIds);
|
|
|
return returnJson;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 领样预览
|
|
|
*/
|