Merge remote-tracking branch 'origin/main'

This commit is contained in:
Euni4U 2025-03-29 10:57:19 +08:00
commit 6068450fb8

View File

@ -71,6 +71,7 @@ public class InspectTemplateServiceImpl implements InspectTemplateService {
{
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
queryWrapper.select("DISTINCT category");
queryWrapper.eq("status", "1");
List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
for (InspectTemplateDO inspectTemplateDO : doList) {
if(inspectTemplateDO!=null)
@ -83,6 +84,7 @@ public class InspectTemplateServiceImpl implements InspectTemplateService {
{
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.eq("status", "1");
List<InspectTemplateDO> doList=templateMapper.selectList(queryWrapper);
for (InspectTemplateDO inspectTemplateDO : doList) {
String category = inspectTemplateDO.getCategory();
@ -98,6 +100,7 @@ public class InspectTemplateServiceImpl implements InspectTemplateService {
public List<String> getAllCategories() {
QueryWrapper<InspectTemplateDO> queryWrapper = new QueryWrapper<>();
queryWrapper.select("DISTINCT category");
queryWrapper.eq("status", "1");
List<InspectTemplateDO> doList = templateMapper.selectList(queryWrapper);
List<String> categories = new ArrayList<>();
for (InspectTemplateDO inspectTemplateDO : doList) {