From 87c623bbb49a855899863fbf9817989f8577192e Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 28 Jul 2021 17:57:34 +0800
Subject: [PATCH] =?UTF-8?q?button=20=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=20(=E9=BB=98=E8=AE=A4=E8=AF=AD=E8=A8=80=E4=B8=AD=E6=96=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SysObjectLanguageOthersDao.java       |  2 ++
 .../impl/SysLanguagePackServiceImpl.java      |  8 ++-----
 src/main/resources/logback-spring.xml         |  4 ++--
 .../language/SysObjectLanguageOthersDao.xml   | 24 +++++++++++++++++++
 4 files changed, 30 insertions(+), 8 deletions(-)

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<SysObjectLanguage
      * @return List<SysObjectLanguageOthers>
      **/
     List<SysObjectLanguageOthers> searchLanguageListByLanguageCode(QuerySysLanguagePack querySysLanguagePack);
+
+    List<SysObjectLanguageOthers> 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<SysObjectLanguageOth
     @Override
     public Map<String, String> searchFunctionButtonList(SysObjectLanguageOthers sysLanguagePack) {
         Map<String, String> buttonMap = new HashMap<>();
-        List<SysObjectLanguageOthers> 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<SysObjectLanguageOthers> 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 @@
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="ERROR"/>
         <logger name="org.springboot.sample" level="ERROR" />
-        <logger name="com.xujie" level="DEBUG" />
+        <logger name="com.gaotao" level="DEBUG" />
     </springProfile>
 
     <!-- 生产环境 -->
     <springProfile name="prod">
         <logger name="org.springframework.web" level="ERROR"/>
         <logger name="org.springboot.sample" level="ERROR" />
-        <logger name="com.xujie" level="ERROR" />
+        <logger name="com.gaotao" level="ERROR" />
     </springProfile>
 
 
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 @@
             </if>
         </where>
     </select>
+    <select id="searchFunctionButtonList"
+            resultType="com.gaotao.modules.language.entity.SysObjectLanguageOthers">
+
+        SELECT
+            solb.object_type,
+            solb.function_id,
+            solb.object_id,
+            solb.table_id,
+            sll.language_code,
+            isNull(solo.language_value,solb.language_value) as language_value
+        FROM
+            sys_object_language_base solb
+                LEFT JOIN sys_language_list sll ON ( 1 = 1 )
+                LEFT JOIN sys_object_language_others solo ON (
+                    sll.language_code = solo.language_code
+                    AND solb.function_id = solo.function_id
+                    AND solb.table_id = solo.table_id
+                    AND solb.object_id = solo.object_id
+                )
+        <where>
+            (sll.language_code = #{languageCode} ANd  solb.function_id = #{functionId} AND solb.object_type =#{objectType} )
+        </where>
+
+    </select>
 </mapper>
\ No newline at end of file