老师端首页bug修改

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -187,7 +187,7 @@ public class NewsController extends BaseController {
 	@ApiOperation("查询资讯详情")
 	@ApiImplicitParam(name = "id", value = "资讯ID编号", required = true, dataType = "Long")
 	@GetMapping("/list/tree")
-	public Object listWithTree(Integer id) {
-		return succeed(sysNewsTypeService.listWithTree(id));
+	public Object listWithTree(Integer id, String memo) {
+		return succeed(sysNewsTypeService.listWithTree(id,memo));
 	}
 }

cms/src/main/java/com/ym/mec/cms/service/SysNewsTypeService.java

@@ -13,5 +13,5 @@ public interface SysNewsTypeService extends BaseService<Integer, SysNewsType> {
 	//根据父级查询子集
 	List<SysNewsTypeTree> queryByParentId(Integer parentId);
 
-	List<SysNewsType> listWithTree(Integer id);
+	List<SysNewsType> listWithTree(Integer id, String memo);
 }

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsTypeServiceImpl.java

@@ -50,14 +50,16 @@ public class SysNewsTypeServiceImpl extends BaseServiceImpl<Integer, SysNewsType
         return sysNewsTypeDao.queryByParentId(parentId);
     }
 
-    public List<SysNewsType> listWithTree(Integer id) {
+    public List<SysNewsType> listWithTree(Integer id, String memo) {
         SysNewsType newsType = sysNewsTypeDao.get(id);
         List<SysNewsType> all = sysNewsTypeDao.findAll(null);
 
         all.forEach(e -> {
-            List<SysNewsInformation> list = informationDao.queryByType(e.getId());
+            List<SysNewsInformation> list = informationDao.queryBySubType(e.getId(), memo);
             if (CollectionUtils.isNotEmpty(list)) {
                 e.setInformationList(list);
+            } else {
+                e.setInformationList(informationDao.queryBySubType(e.getId(), null));
             }
         });
         List<SysNewsType> treeMenus = all.stream()