Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
6068450fb8
@ -71,6 +71,7 @@ public class InspectTemplateServiceImpl implements InspectTemplateService {
|
|||||||
{
|
{
|
||||||
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.select("DISTINCT category");
|
queryWrapper.select("DISTINCT category");
|
||||||
|
queryWrapper.eq("status", "1");
|
||||||
List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
|
List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
|
||||||
for (InspectTemplateDO inspectTemplateDO : doList) {
|
for (InspectTemplateDO inspectTemplateDO : doList) {
|
||||||
if(inspectTemplateDO!=null)
|
if(inspectTemplateDO!=null)
|
||||||
@ -83,6 +84,7 @@ public class InspectTemplateServiceImpl implements InspectTemplateService {
|
|||||||
{
|
{
|
||||||
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.eq("type", type);
|
queryWrapper.eq("type", type);
|
||||||
|
queryWrapper.eq("status", "1");
|
||||||
List<InspectTemplateDO> doList=templateMapper.selectList(queryWrapper);
|
List<InspectTemplateDO> doList=templateMapper.selectList(queryWrapper);
|
||||||
for (InspectTemplateDO inspectTemplateDO : doList) {
|
for (InspectTemplateDO inspectTemplateDO : doList) {
|
||||||
String category = inspectTemplateDO.getCategory();
|
String category = inspectTemplateDO.getCategory();
|
||||||
@ -98,6 +100,7 @@ public class InspectTemplateServiceImpl implements InspectTemplateService {
|
|||||||
public List<String> getAllCategories() {
|
public List<String> getAllCategories() {
|
||||||
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
|
||||||
queryWrapper.select("DISTINCT category");
|
queryWrapper.select("DISTINCT category");
|
||||||
|
queryWrapper.eq("status", "1");
|
||||||
List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
|
List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
|
||||||
List<String> categories = new ArrayList<>();
|
List<String> categories = new ArrayList<>();
|
||||||
for (InspectTemplateDO inspectTemplateDO : doList) {
|
for (InspectTemplateDO inspectTemplateDO : doList) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user