From b2d1202c833d31130219e64ace02f33425435266 Mon Sep 17 00:00:00 2001 From: Rui_Li <877258667@qq.com> Date: Fri, 7 Feb 2025 18:00:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eapi=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/Impl/PropertiesServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java index 8e98fa2c..0d7967a7 100644 --- a/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java +++ b/src/main/java/com/spring/modules/base/service/Impl/PropertiesServiceImpl.java @@ -299,7 +299,8 @@ public class PropertiesServiceImpl implements PropertiesService { //区分是否是工具方法过来的参数 if("TL".equalsIgnoreCase(functionType) || "TLI".equalsIgnoreCase(functionType)){ - return propertiesMapper.searchPropertiesChoose("*", functionType, list); + //return propertiesMapper.searchPropertiesChoose("*", functionType, list); 暂时注释掉 + return propertiesMapper.searchPropertiesUnChoose(inData.getSite(), functionType, list); }else { return propertiesMapper.searchPropertiesUnChoose(inData.getSite(), functionType, list); } @@ -420,7 +421,8 @@ public class PropertiesServiceImpl implements PropertiesService { String recordType = inData.getRecordType(); List result = null; if("TL".equalsIgnoreCase(recordType) || "TLI".equalsIgnoreCase(recordType)){ - result = propertiesMapper.getPropertiesListByPartAndCodeNoForTool(inData); + //result = propertiesMapper.getPropertiesListByPartAndCodeNoForTool(inData); 暂时不需要 + result = propertiesMapper.getPropertiesListByPartAndCodeNo(inData); }else { result = propertiesMapper.getPropertiesListByPartAndCodeNo(inData); } @@ -428,7 +430,9 @@ public class PropertiesServiceImpl implements PropertiesService { if ("Y".equals(result.get(i).getValueChooseFlag())) { //针对工具的情况 需要特殊设置 if("TL".equalsIgnoreCase(recordType) || "TLI".equalsIgnoreCase(recordType)){ - List availableList = partInformationMapper.getAvailableValueListForTool(result.get(i)); + //List availableList = partInformationMapper.getAvailableValueListForTool(result.get(i)); + //result.get(i).setAvailableValueList(availableList); + List availableList = partInformationMapper.getAvailableValueList(result.get(i)); result.get(i).setAvailableValueList(availableList); }else { List availableList = partInformationMapper.getAvailableValueList(result.get(i));