|
@@ -87,19 +87,18 @@ public class KuaishouItemListController extends BaseController {
|
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
TableDataInfo dataInfo = new TableDataInfo();
|
|
|
try {
|
|
try {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
- if (Check.isNull(userId)) {
|
|
|
|
|
- throw new Exception("请传入userId");
|
|
|
|
|
- }
|
|
|
|
|
- String roleKey = sysRoleService.getRoleBYUserId(userId);
|
|
|
|
|
- if (roleKey.equals("courtship")) {
|
|
|
|
|
- requestMap.put("userId", userId);
|
|
|
|
|
- } else if (roleKey.equals("courtshipManager")) {
|
|
|
|
|
- Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
|
|
|
- if (Check.isNull(deptId)) {
|
|
|
|
|
- throw new Exception("此用户未获取相关部门");
|
|
|
|
|
|
|
+ if (!Check.isNull(userId)) {
|
|
|
|
|
+ String roleKey = sysRoleService.getRoleBYUserId(userId);
|
|
|
|
|
+ if (roleKey.equals("courtship")) {
|
|
|
|
|
+ requestMap.put("userId", userId);
|
|
|
|
|
+ } else if (roleKey.equals("courtshipManager")) {
|
|
|
|
|
+ Long deptId = sysDeptService.getDeptIdByUserId(userId);
|
|
|
|
|
+ if (Check.isNull(deptId)) {
|
|
|
|
|
+ throw new Exception("此用户未获取相关部门");
|
|
|
|
|
+ }
|
|
|
|
|
+ List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
|
|
|
|
|
+ requestMap.put("userIds", userIds);
|
|
|
}
|
|
}
|
|
|
- List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
|
|
|
|
|
- requestMap.put("userIds", userIds);
|
|
|
|
|
}
|
|
}
|
|
|
if (!Check.isNull(examineStatus)) {
|
|
if (!Check.isNull(examineStatus)) {
|
|
|
requestMap.put("examineStatus", examineStatus);
|
|
requestMap.put("examineStatus", examineStatus);
|
|
@@ -201,7 +200,6 @@ public class KuaishouItemListController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
@GetMapping("/addCategoryId")
|
|
@GetMapping("/addCategoryId")
|
|
|
public void addCategoryId() throws KsMerchantApiException {
|
|
public void addCategoryId() throws KsMerchantApiException {
|
|
|
kuaishouItemListService.addCategoryId();
|
|
kuaishouItemListService.addCategoryId();
|