1
This commit is contained in:
parent
1d9d111629
commit
ffa80b15ba
@ -7,6 +7,7 @@ import com.ruoyi.busi.mapper.BusiCategoryMapper;
|
|||||||
import com.ruoyi.busi.service.IBusiCategoryService;
|
import com.ruoyi.busi.service.IBusiCategoryService;
|
||||||
import com.ruoyi.busi.vo.BusiCategoryVO;
|
import com.ruoyi.busi.vo.BusiCategoryVO;
|
||||||
import com.ruoyi.common.core.domain.DlBaseEntity;
|
import com.ruoyi.common.core.domain.DlBaseEntity;
|
||||||
|
import com.ruoyi.common.utils.StringUtils;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -41,8 +42,11 @@ public class BusiCategoryServiceImpl extends ServiceImpl<BusiCategoryMapper, Bus
|
|||||||
//查询全部栏目
|
//查询全部栏目
|
||||||
LambdaQueryWrapper<BusiCategory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<BusiCategory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0)
|
lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0)
|
||||||
.eq(BusiCategory::getTenantId,category.getTenantId());
|
.eq(BusiCategory::getTenantId,category.getTenantId())
|
||||||
|
.orderByAsc(DlBaseEntity::getCreateTime);
|
||||||
|
if (StringUtils.isEmpty(category.getCatgName())) {
|
||||||
|
lambdaQueryWrapper.like(BusiCategory::getCatgName,category.getCatgName());
|
||||||
|
}
|
||||||
List<BusiCategory> list = list(lambdaQueryWrapper);
|
List<BusiCategory> list = list(lambdaQueryWrapper);
|
||||||
return buildCategoryTree(list);
|
return buildCategoryTree(list);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,17 +3,17 @@
|
|||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="8">
|
<el-col :span="6">
|
||||||
<el-form-item label="栏目编号" prop="code">
|
<el-form-item label="栏目编号" prop="code">
|
||||||
<el-input v-model="form.code" placeholder="请输入栏目编号" />
|
<el-input v-model="form.code" placeholder="请输入栏目编号" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="6">
|
||||||
<el-form-item label="栏目名称" prop="catgName">
|
<el-form-item label="栏目名称" prop="catgName">
|
||||||
<el-input v-model="form.catgName" placeholder="请输入栏目名称" />
|
<el-input v-model="form.catgName" placeholder="请输入栏目名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="6">
|
||||||
<el-form-item label="栏目类型" prop="catgType">
|
<el-form-item label="栏目类型" prop="catgType">
|
||||||
<el-select v-model="form.catgType" placeholder="请选择通告栏目类型" >
|
<el-select v-model="form.catgType" placeholder="请选择通告栏目类型" >
|
||||||
<el-option
|
<el-option
|
||||||
@ -25,6 +25,11 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-form-item label="排序" prop="sort">
|
||||||
|
<el-input v-model="form.sort" placeholder="请输入排序" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user