修复

xieb

2025-01-21 bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21

 src/main/java/org/springblade/modules/leave/controller/LeaveWordsController.java

@@ -28,7 +28,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.assessment.entity.AssessmentScoreEntity;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -81,8 +80,8 @@
      QueryWrapper<LeaveWordsEntity> queryWrapper = Condition.getQueryWrapper(leaveWords, LeaveWordsEntity.class);
//      List<LeaveWordsEntity> list = leaveWordsService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(LeaveWordsEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
//      List<LeaveWordsEntity> list = leaveWordsService.list(queryWrapper);
      IPage<LeaveWordsEntity> pages = leaveWordsService.page(Condition.getPage(query), Condition.getQueryWrapper(leaveWords, LeaveWordsEntity.class));
      return R.data(LeaveWordsWrapper.build().treeNodePageVO(pages));
      IPage<LeaveWordsEntity> pages = leaveWordsService.page(Condition.getPage(query), Condition.getQueryWrapper(leaveWords, LeaveWordsEntity.class).eq("parent_id", 0));
      return R.data(LeaveWordsWrapper.build().pageVO(pages));
   }

   /**
@@ -119,7 +118,7 @@
   /**
    * 留言板块 新增或修改
    */
   @PostMapping("/submit")
   @PostMapping(value = "/submit", produces = "application/json;charset=UTF-8")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入leaveWords")
   public R submit(@Valid @RequestBody LeaveWordsEntity leaveWords) {