【新增】修改接口

src/main/java/io/office/modules/manage/controller/NewsController.java

@@ -36,6 +36,8 @@ import io.office.common.utils.R;
 public class NewsController extends AbstractController {
     @Autowired
     private NewsService newsService;
+    @Autowired
+    private NewsclassService newsclassService;
 
     /**
      * 列表
@@ -59,6 +61,16 @@ public class NewsController extends AbstractController {
         NewsEntity news = newsService.getById(id);
         String name = this.newsService.selectClassName(news.getClassid());
         news.setClassName(name);
+        //根据classid查询有没有父级id
+        NewsclassEntity newsclassEntity = newsclassService.getById(news.getClassid());
+        if(newsclassEntity!=null) {
+            if(newsclassEntity.getPId()!=null &&newsclassEntity.getPId()!=0) {
+                news.setClassid(newsclassEntity.getId());
+                news.setClassName(newsclassEntity.getName());
+                news.setCclassid(news.getClassid());
+                news.setClassName(news.getClassName());
+            }
+        }
         return R.ok().put("news", news);
     }
 

src/main/java/io/office/modules/manage/controller/UserFunctionBindingController.java

@@ -35,11 +35,13 @@ public class UserFunctionBindingController extends AbstractController {
      */
     @RequestMapping("/authApi/find")
     public R find(){
+        Object[] functionids = null;
         Integer id=getUserId().intValue();
         if(id==null){
-            return R.error("用户信息有误");
+            //未登录
+            return R.ok().put("functionids", functionids);
         }
-        Object[] functionids = userFunctionBindingService.queryList(id);
+        functionids = userFunctionBindingService.queryList(id);
         return R.ok().put("functionids", functionids);
     }
     /**

src/main/java/io/office/modules/manage/entity/NewsEntity.java

@@ -101,6 +101,9 @@ public class NewsEntity implements Serializable {
 	private Integer classid;
 	@TableField(exist = false)
 	private Integer cclassid;
+
+	@TableField(exist = false)
+	private String cclassName;
 	/**
 	 * 出版时间
 	 */

src/main/java/io/office/modules/manage/service/impl/NewsServiceImpl.java

@@ -3,6 +3,7 @@ package io.office.modules.manage.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.utils.R;
+import io.office.modules.manage.dao.NewsclassDao;
 import io.office.modules.manage.entity.*;
 import io.office.modules.manage.entity.dto.NewsParams;
 import io.office.modules.manage.vo.response.SearchVo;

src/main/java/io/office/modules/manage/transfer/TransferController.java

@@ -503,11 +503,8 @@ public class TransferController {
                                 if (newsEntity.getContent().indexOf("LeaguerService.aspx") > -1) {
                                     newsEntityDB.setContent(newsEntity.getContent().replaceAll("LeaguerService.aspx", "Member"));
                                 }
-
-
                             }
 
-
                             if (StringUtils.isNotBlank(newsEntity.getContent())) {
 
 //                                if (newsEntity.getContent().indexOf("<img src=\"/UserFiles/") > -1) {//官网的链接