问题处理

hx-tenant/src/main/java/com/fjhx/tenant/utils/DictCodingService.java

@@ -43,8 +43,8 @@ public class DictCodingService {
 
         DictTenantDataVo dictTenantDataVo = DictUtils.getDictDataMap(dictCode).get(dictKey);
         List<RuleVo> ruleVoList = JSON.parseArray(dictTenantDataVo.getRuleJson(), RuleVo.class);
-        if (ruleVoList.size() == 0) {
-            throw new ServiceException("编码生成规则为空");
+        if (ObjectUtil.isEmpty(ruleVoList) && ruleVoList.size() == 0) {
+            throw new ServiceException("客户类型编码生成规则为空，请先前往【业务字典】-【客户类型】配置编码生成规则！");
         }
 
         for (RuleVo ruleVo : ruleVoList) {
@@ -59,10 +59,10 @@ public class DictCodingService {
                     String value = ruleVo.getValue();
 
                     dictTenantDataVo.setRuleNum(dictTenantDataVo.getRuleNum() + 1);
-                    if(ObjectUtil.equals(dictTenantDataVo.getType(),1)) {
+                    if (ObjectUtil.equals(dictTenantDataVo.getType(), 1)) {
                         DictCommonData dictCommonData = BeanUtil.copyProperties(dictTenantDataVo, DictCommonData.class);
                         dictCommonDataService.updateById(dictCommonData);
-                    }else {
+                    } else {
                         dictTenantDataService.updateById(dictTenantDataVo);
                     }
 

ruoyi-system/src/main/java/com/ruoyi/system/utils/UserUtil.java

@@ -10,10 +10,7 @@ import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -42,6 +39,10 @@ public class UserUtil {
         return getListByIds(idList).stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
     }
 
+    public static String getNickNameById(Long userId){
+        return getNickNameMapByIds(Collections.singletonList(userId)).get(userId);
+    }
+
     public static <T> void assignmentNickName(List<T> list, Function<T, Long> idMapper, BiConsumer<T, String> setNickNameMap) {
         if (list == null || list.size() == 0) {
             return;