Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java

@@ -18,6 +18,9 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.circle.dto.CircleDTO;
import org.springblade.modules.circle.entity.CircleCommentEntity;
import org.springblade.modules.circle.entity.CircleEntity;
@@ -53,6 +56,7 @@

   @Autowired
   private ICircleCommentService iCircleCommentService;

   @Override
   public IPage<CircleVO> selectCirclePage(IPage<CircleVO> page, CircleVO circle) {
      List<CircleVO> circleVOS = baseMapper.selectCirclePage(page, circle);
@@ -78,8 +82,7 @@
    * @return 圈子表
    */
   @Override
   public CircleVO selectCircleById(Integer id)
   {
   public CircleVO selectCircleById(Integer id) {
      return this.baseMapper.selectCircleById(id);
   }

@@ -90,13 +93,17 @@
    * @return 圈子表集合
    */
   @Override
   public List<CircleVO> selectCircleList(CircleDTO circleDTO)
   {
   public List<CircleVO> selectCircleList(CircleDTO circleDTO) {
      return this.baseMapper.selectCircleList(circleDTO);
   }

   @Override
   public String saveCircle(CircleEntity circle) {
      circle.setUserId(AuthUtil.getUserId());
      String communityCode = SpringUtils.getRequestParam("communityCode");
      if (StringUtils.isNotBlank(communityCode)) {
         circle.setCommunityCode(communityCode);
      }
      boolean flag = false;
      // 先进行敏感词过滤
      Map<String, Object> map = worksService.interceptWords(circle.getCircleText());