|
|
@ -136,7 +136,7 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl |
|
|
|
cmsArticle.setColumnName(cmsColumn.getName()); |
|
|
|
cmsArticle.setColumnName(cmsColumn.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
QueryWrapper<Subweside> subwesideQueryWrapper = new QueryWrapper<>(); |
|
|
|
QueryWrapper<Subweside> subwesideQueryWrapper = new QueryWrapper<>(); |
|
|
|
subwesideQueryWrapper.in("id", principal.getId()); |
|
|
|
subwesideQueryWrapper.in("compadminid", principal.getId()); |
|
|
|
List<Subweside> subwesideList = subwesideService.list(subwesideQueryWrapper); |
|
|
|
List<Subweside> subwesideList = subwesideService.list(subwesideQueryWrapper); |
|
|
|
if (!subwesideList.isEmpty()) { |
|
|
|
if (!subwesideList.isEmpty()) { |
|
|
|
List<String> subnames = subwesideList.stream() |
|
|
|
List<String> subnames = subwesideList.stream() |
|
|
@ -145,7 +145,7 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl |
|
|
|
String joinedString = String.join(", ", subnames); |
|
|
|
String joinedString = String.join(", ", subnames); |
|
|
|
cmsArticle.setSource("来自子站:"+joinedString); |
|
|
|
cmsArticle.setSource("来自子站:"+joinedString); |
|
|
|
}else { |
|
|
|
}else { |
|
|
|
cmsArticle.setSource("管理员"); |
|
|
|
cmsArticle.setSource(""); |
|
|
|
} |
|
|
|
} |
|
|
|
cmsArticleService.updateById(cmsArticle); |
|
|
|
cmsArticleService.updateById(cmsArticle); |
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
return Result.OK("编辑成功!"); |
|
|
|