diff --git a/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java b/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java index fd758eb..7533342 100644 --- a/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java +++ b/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java @@ -42,4 +42,6 @@ public interface SysObjectLanguageOthersDao extends BaseMapper **/ List searchLanguageListByLanguageCode(QuerySysLanguagePack querySysLanguagePack); + + List searchFunctionButtonList(SysObjectLanguageOthers sysLanguagePack); } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java b/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java index 077715b..ea33565 100644 --- a/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java +++ b/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java @@ -70,12 +70,8 @@ public class SysLanguagePackServiceImpl extends ServiceImpl searchFunctionButtonList(SysObjectLanguageOthers sysLanguagePack) { Map buttonMap = new HashMap<>(); - List list = lambdaQuery() - .eq(sysLanguagePack.getLanguageCode() != null, SysObjectLanguageOthers::getLanguageCode, sysLanguagePack.getLanguageCode()) - .eq(sysLanguagePack.getFunctionId() != null, SysObjectLanguageOthers::getFunctionId, sysLanguagePack.getFunctionId()) - .eq(sysLanguagePack.getObjectId() != null, SysObjectLanguageOthers::getObjectId, sysLanguagePack.getObjectId()) - .eq(sysLanguagePack.getObjectType() != null, SysObjectLanguageOthers::getObjectType, sysLanguagePack.getObjectType()).list(); - for (SysObjectLanguageOthers languagePack : list) { + List languageOthersList = this.baseMapper.searchFunctionButtonList(sysLanguagePack); + for (SysObjectLanguageOthers languagePack : languageOthersList) { buttonMap.put(languagePack.getObjectId(), languagePack.getLanguageValue()); } return buttonMap; diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 2ce4f70..17053a3 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -169,14 +169,14 @@ - + - + diff --git a/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml b/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml index c49d23b..2b6a28d 100644 --- a/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml +++ b/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml @@ -85,4 +85,28 @@ + \ No newline at end of file