xieb
2023-12-21 1eef460423fc852ebfa1ff425dc1414d5e147100
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));
   }
   /**