From 202157cf81af12aaa9cf1b8e860a02dbb55bfe2a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 22 十月 2026 20:28:25 +0800
Subject: [PATCH] feat: 完善直绑模板设备初始化与审批人权限校验
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
index f38131e..6d4af01 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -105,8 +106,12 @@
}
@Override
- public IPage<StandardMethod> selectStandardMethodList(Page page, StandardMethod standardMethod) {
- IPage<StandardMethod> result = standardMethodMapper.selectStandardMethodList(page, QueryWrappers.queryWrappers(standardMethod));
+ public IPage<StandardMethod> selectStandardMethodList(Page page, StandardMethod standardMethod, Integer industryId) {
+ QueryWrapper<StandardMethod> wrapper = QueryWrappers.queryWrappers(standardMethod);
+ if (industryId != null) {
+ wrapper.exists("select 1 from standard_method_industry smi where smi.standard_method_id = a.id and smi.industry_id = {0}", industryId);
+ }
+ IPage<StandardMethod> result = standardMethodMapper.selectStandardMethodList(page, wrapper);
for (StandardMethod method : result.getRecords()) {
method.setIndustryIds(selectIndustryIds(method.getId()));
}
--
Gitblit v1.9.3