From d82d7462eaf72b059ac0d7e4da34f10b9d09f5ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 2 Jul 2025 11:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/wms/admin/service/UserControllerService.java    | 2 ++
 .../nflg/wms/repository/mapper/DictionaryItemMapper.java | 4 +++-
 .../service/impl/DictionaryItemServiceImpl.java          | 5 ++---
 .../src/main/resources/mapper/DictionaryItemMapper.xml   | 9 +++++++++
 .../src/main/resources/mapper/UserRoleMapMapper.xml      | 2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java
index 97a22b53..911e6b02 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java
@@ -453,8 +453,10 @@ public class UserControllerService {
                 if (Objects.isNull(userSupplier)) {
                     userSupplier = new UserSupplier();
                     user = new User();
+                    user.setId(IdUtil.getSnowflakeNextId());
                     user.setCreateBy(UserUtil.getUserName());
                     user.setCreateTime(LocalDateTime.now());
+                    userSupplier.setUserId(user.getId());
                 } else {
                     user = uService.getById(userSupplier.getUserId());
                     user.setUpdateBy(UserUtil.getUserName());
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemMapper.java
index fb675ef9..ca2bc880 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemMapper.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemMapper.java
@@ -22,7 +22,9 @@ public interface DictionaryItemMapper extends BaseMapper<DictionaryItem> {
 
     String getName(String dictionaryCode, String itemCode);
 
-    List<DictionaryItem> getListByDictionaryCode(String code, String language);
+    List<DictionaryItem> getListByDictionaryCode(String code);
 
     DictionaryItem getByCode(String dictionaryCode, String dictionaryItemCode);
+
+    List<DictionaryItem> getLanguageListByDictionaryCode(String code, String language);
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemServiceImpl.java
index ebe7df97..fec6550a 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemServiceImpl.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nflg.wms.common.constant.Constant;
 import com.nflg.wms.common.pojo.qo.DictionaryItemSearchQO;
 import com.nflg.wms.common.pojo.qo.SaveDictionaryItemQO;
 import com.nflg.wms.common.pojo.qo.TranslateMap;
@@ -127,12 +126,12 @@ public class DictionaryItemServiceImpl extends ServiceImpl<DictionaryItemMapper,
 
     @Override
     public List<DictionaryItem> getListByDictionaryCode(String code) {
-        return getListByDictionaryCode(code, Constant.DEFAULT_LANGUAGE_CODE);
+        return baseMapper.getListByDictionaryCode(code);
     }
 
     @Override
     public List<DictionaryItem> getListByDictionaryCode(String code, String language) {
-        return baseMapper.getListByDictionaryCode(code, language);
+        return baseMapper.getLanguageListByDictionaryCode(code, language);
     }
 
     @Override
diff --git a/nflg-wms-repository/src/main/resources/mapper/DictionaryItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/DictionaryItemMapper.xml
index 0ec9fa75..2384bc40 100644
--- a/nflg-wms-repository/src/main/resources/mapper/DictionaryItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/DictionaryItemMapper.xml
@@ -24,4 +24,13 @@
         WHERE d.code = #{dictionaryCode}
           AND di.code = #{dictionaryItemCode}
     </select>
+
+    <select id="getLanguageListByDictionaryCode" resultType="com.nflg.wms.repository.entity.DictionaryItem">
+        SELECT di.id,di.dictionary_id,di.name,di.code,COALESCE(dit.value,di.value) as "value",di.create_by,di.create_time,di.update_by,di.update_time
+        FROM dictionary d
+                 INNER JOIN dictionary_item di ON d.id = di.dictionary_id
+            inner join dictionary_item_translate dit on di.id = dit.dictionary_item_id
+        WHERE d.code = #{code} and dit.language_code = #{language}
+        ORDER BY di.id
+    </select>
 </mapper>
diff --git a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
index 93d6353d..0eeab3b1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.nflg.wms.repository.mapper.UserRoleMapMapper">
 
     <select id="getRoleList" resultType="com.nflg.wms.common.pojo.vo.RoleVO">
-        SELECT r.*
+        SELECT distinct r.*
         FROM user_role_map urm
                  INNER JOIN "role" r ON urm.role_id=r."id"
         WHERE urm.user_id=#{id}