修改新闻接口

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -122,6 +122,7 @@ public class NewsController {
         List<NewsRelationVo> newsRelationVoList = newsRelationService.selectJoinList(NewsRelationVo.class,
                 new MPJLambdaWrapper<NewsRelation>()
                         .eq(NewsRelation::getNewsId, id)
+                        .select(NewsRelation::getId)
                         .select(NewsRelation.class, x -> VoToColumnUtil.fieldsToColumns(NewsRelationVo.class).contains(x.getProperty()))
                         .leftJoin(XjrUser.class, XjrUser::getId, NewsRelation::getUserId, ext -> ext.selectAs(XjrUser::getName, NewsRelationVo::getUserName)));
         if (newsRelationVoList.size() > 0) {
@@ -130,6 +131,7 @@ public class NewsController {
 
         List<NewsAppendixVo> newsAppendixVoList = newsAppendixService.selectJoinList(NewsAppendixVo.class,
                 new MPJLambdaWrapper<NewsAppendix>().eq(NewsAppendix::getNewsId, id)
+                        .select(NewsRelation::getId)
                         .select(NewsAppendix.class, x -> VoToColumnUtil.fieldsToColumns(NewsAppendixVo.class).contains(x.getProperty()))
                         .leftJoin(File.class, File::getId, NewsAppendix::getFileId, ext -> ext.selectAs(File::getFileName, NewsAppendixVo::getFileName))
         );
@@ -144,8 +146,8 @@ public class NewsController {
     @PutMapping
     @ApiOperation(value = "修改新闻")
     public R update(@RequestBody UpdateNewsDto updateNewsDto) {
-        News news = BeanUtil.toBean(updateNewsDto, News.class);
-        return R.ok(newsService.updateById(news));
+        //News news = BeanUtil.toBean(updateNewsDto, News.class);
+        return R.ok(newsService.update(updateNewsDto));
     }
 
     @DeleteMapping

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -53,16 +53,17 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
             newsAppendix.setNewsId(news.getId());
             newsAppendixMapper.insert(newsAppendix);
         }
-
-        for (AddNewsRelationDto relationDto : addNewsDto.getRelationList()) {
-            NewsRelation newsRelation = new NewsRelation();// BeanUtil.toBean(relationDto, NewsRelation.class);
-            newsRelation.setNewsId(news.getId());
-            newsRelation.setReadMark(0);
-            if (relationDto.getRelationType() == 1) {
-                // 获取部门下的人员添加
-            } else {
-                newsRelation.setUserId(relationDto.getRelationId());
-                newsRelationMapper.insert(newsRelation);
+        if(addNewsDto.getRelationList()!=null) {
+            for (AddNewsRelationDto relationDto : addNewsDto.getRelationList()) {
+                NewsRelation newsRelation = BeanUtil.toBean(relationDto, NewsRelation.class);
+                newsRelation.setNewsId(news.getId());
+                newsRelation.setReadMark(0);
+                if (relationDto.getRelationType() == 1) {
+                    // 获取部门下的人员添加
+                } else {
+                    newsRelation.setUserId(relationDto.getRelationId());
+                    newsRelationMapper.insert(newsRelation);
+                }
             }
         }
 
@@ -73,7 +74,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
     @Transactional(rollbackFor = Exception.class)
     public boolean update(UpdateNewsDto updateNewsDto) {
         News news = BeanUtil.toBean(updateNewsDto, News.class);
-        newsMapper.insert(news);
+        newsMapper.updateById(news);
 
 
         newsAppendixMapper.delete(Wrappers.lambdaQuery(NewsAppendix.class).eq(NewsAppendix::getNewsId,news.getId()));
@@ -83,16 +84,18 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
             newsAppendixMapper.insert(newsAppendix);
         }
 
-        newsRelationMapper.delete(Wrappers.lambdaQuery(NewsRelation.class).eq(NewsRelation::getNewsId,news.getId()));
-        for (AddNewsRelationDto relationDto : updateNewsDto.getRelationList()) {
-            NewsRelation newsRelation = new NewsRelation();
-            newsRelation.setNewsId(news.getId());
-            newsRelation.setReadMark(0);
-            if (relationDto.getRelationType() == 1) {
-                // 获取部门下的人员添加
-            } else {
-                newsRelation.setUserId(relationDto.getRelationId());
-                newsRelationMapper.insert(newsRelation);
+        if(updateNewsDto.getRelationList()!=null) {
+            newsRelationMapper.delete(Wrappers.lambdaQuery(NewsRelation.class).eq(NewsRelation::getNewsId, news.getId()));
+            for (AddNewsRelationDto relationDto : updateNewsDto.getRelationList()) {
+                NewsRelation newsRelation = BeanUtil.toBean(relationDto, NewsRelation.class);
+                newsRelation.setNewsId(news.getId());
+                newsRelation.setReadMark(0);
+                if (relationDto.getRelationType() == 1) {
+                    // 获取部门下的人员添加
+                } else {
+                    newsRelation.setUserId(relationDto.getRelationId());
+                    newsRelationMapper.insert(newsRelation);
+                }
             }
         }
 

src/main/java/com/xjrsoft/module/oa/vo/NewsAppendixVo.java

@@ -16,5 +16,5 @@ public class NewsAppendixVo {
     private Long fileId;
 
     @ApiModelProperty("文件名称")
-    private Long fileName;
+    private String fileName;
 }