|
@@ -359,9 +359,12 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
public JSONObject getPersonalInfo(Long userId, String type) {
|
|
|
String roleKey = userService.getRoleKeyByUserId(String.valueOf(userId));
|
|
|
List<Long> userList = null;
|
|
|
- if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey) || "associationManager".equals(roleKey)) {
|
|
|
+ if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey)) {
|
|
|
Long deptId = deptService.getDeptIdByUserId(userId);
|
|
|
userList = deptService.getDeptUserListByDeptId(deptId);
|
|
|
+ } else if (roleKey.contains("association")) {
|
|
|
+ //社群查看所有 all
|
|
|
+ userList = null;
|
|
|
} else {
|
|
|
userList = Arrays.asList(userId);
|
|
|
}
|
|
@@ -373,7 +376,6 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
userList = deptService.getDeptUserListByDeptId(150200L);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
JSONObject data = new JSONObject();
|
|
|
SysUser sysUser = userService.selectUserById(userId);
|
|
@@ -396,9 +398,12 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
public JSONObject getOrderData(Long userId, String startDate, String endDate, String type) {
|
|
|
String roleKey = userService.getRoleKeyByUserId(String.valueOf(userId));
|
|
|
List<Long> userList = null;
|
|
|
- if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey) || "associationManager".equals(roleKey)) {
|
|
|
+ if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey)) {
|
|
|
Long deptId = deptService.getDeptIdByUserId(userId);
|
|
|
userList = deptService.getDeptUserListByDeptId(deptId);
|
|
|
+ } else if (roleKey.contains("association")) {
|
|
|
+ //社群查看所有 all
|
|
|
+ userList = null;
|
|
|
} else {
|
|
|
userList = Arrays.asList(userId);
|
|
|
}
|
|
@@ -541,9 +546,12 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
public JSONObject getDataAnalysis(Long userId, String type) {
|
|
|
String roleKey = userService.getRoleKeyByUserId(String.valueOf(userId));
|
|
|
List<Long> userList = null;
|
|
|
- if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey) || "associationManager".equals(roleKey)) {
|
|
|
+ if ("courtshipManager".equals(roleKey) || "bdManager".equals(roleKey)) {
|
|
|
Long deptId = deptService.getDeptIdByUserId(userId);
|
|
|
userList = deptService.getDeptUserListByDeptId(deptId);
|
|
|
+ } else if (roleKey.contains("association")) {
|
|
|
+ //社群查看所有 all
|
|
|
+ userList = null;
|
|
|
} else {
|
|
|
userList = Arrays.asList(userId);
|
|
|
}
|