diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java index ba33286..8b85991 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java @@ -34,21 +34,21 @@ public class CbamProdProcessDictServiceImpl extends BaseServiceImpl getByIndustryId(Long industryId) { - return getByIndustryIdAndType(industryId, null,"yl", Constant.ASC); + return getByPidIdAndType(industryId, null,"yl", Constant.ASC); } @Override public List getByProdId(Long prodId) { - return getByIndustryIdAndType(prodId, null,"gylx", Constant.ASC); + return getByPidIdAndType(prodId, null,"gylx", Constant.ASC); } @Override public List getByProdIds(List prodIds) { - return getByIndustryIdAndType(null, prodIds,"gylx", Constant.ASC); + return getByPidIdAndType(null, prodIds,"gylx", Constant.ASC); } - public List getByIndustryIdAndType(Long pidId,List pidIds, String type, String order) { + public List getByPidIdAndType(Long pidId, List pidIds, String type, String order) { boolean asc = true; if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) { asc = false;