|
@@ -59,31 +59,21 @@ public class NewsController extends BaseController {
|
|
|
@ApiOperation("资讯列表分页查询")
|
|
|
@GetMapping(value = "/list")
|
|
|
public Object getList(NewsInformationQueryInfo queryInfo) {
|
|
|
- SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
-
|
|
|
if(queryInfo.getType() == 6 || queryInfo.getType() == 4){
|
|
|
queryInfo.setTenantId(-1);
|
|
|
}
|
|
|
-
|
|
|
String clientId = queryInfo.getClientId();
|
|
|
-
|
|
|
- if (!StringUtils.equalsIgnoreCase("student", clientId)) {
|
|
|
- queryInfo.setOrganIdList(webFeignService.queryOrganIdByUserId(user.getId(), clientId));
|
|
|
- } else {
|
|
|
- if (user == null || user.getId() == null) {
|
|
|
- queryInfo.setOrganId(43);
|
|
|
- } else {
|
|
|
- queryInfo.setOrganId(user.getOrganId());
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- List<Integer> excludeIds = new ArrayList<>();
|
|
|
|
|
|
+ SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
if (user == null || user.getId() == null) {
|
|
|
queryInfo.setOrganId(43);
|
|
|
- queryInfo.setExcludeIds(excludeIds);
|
|
|
+ queryInfo.setExcludeIds(new ArrayList<>());
|
|
|
} else {
|
|
|
- queryInfo.setOrganId(user.getOrganId());
|
|
|
+ if (!StringUtils.equalsIgnoreCase("student", clientId)) {
|
|
|
+ queryInfo.setOrganIdList(webFeignService.queryOrganIdByUserId(user.getId(), clientId));
|
|
|
+ }else {
|
|
|
+ queryInfo.setOrganId(user.getOrganId());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|