From 30abb94bc8a41aba57c21eee35361c4f9985bccc Mon Sep 17 00:00:00 2001
From: Parker <meet.parker@foxmail.com>
Date: Tue, 9 Mar 2021 15:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9A=82=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=95=B0=E6=8D=AE=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=90=8E=E6=9C=9F=E6=94=BB=E5=87=BB=E8=A1=8C=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/opsli/modulars/system/SystemMsg.java  | 2 +-
 .../opsli/modulars/system/user/web/UserRestController.java  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java
index 76ff976e..ab682221 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java
@@ -59,7 +59,7 @@ public enum SystemMsg implements BaseMsg {
     EXCEPTION_USER_NO_UNIQUE(20306,"该工号已存在"),
     EXCEPTION_ORG_NOT_NULL(20307,"组织不可为空"),
     EXCEPTION_USER_ORG_ERROR(20308,"用户组织设置失败"),
-    EXCEPTION_USER_NULL(20309,"暂无该用户"),
+    EXCEPTION_USER_NULL(20309,"暂无该用户: {}"),
     EXCEPTION_USER_FILE_NULL(20310,"请选择文件"),
 
 
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java
index a4d2e5ed..c31518af 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java
@@ -21,6 +21,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
@@ -44,7 +45,6 @@ import org.opsli.common.exception.TokenException;
 import org.opsli.common.utils.HumpUtil;
 import org.opsli.common.utils.WrapperUtil;
 import org.opsli.core.base.controller.BaseRestController;
-import org.opsli.core.msg.CoreMsg;
 import org.opsli.core.msg.TokenMsg;
 import org.opsli.core.persistence.Page;
 import org.opsli.core.persistence.querybuilder.GenQueryBuilder;
@@ -460,7 +460,9 @@ public class UserRestController extends BaseRestController<SysUser, UserModel, I
         UserModel userModel = IService.queryByUserName(username);
         if(userModel == null){
             // 暂无该用户
-            throw new ServiceException(SystemMsg.EXCEPTION_USER_NULL);
+            throw new ServiceException(SystemMsg.EXCEPTION_USER_NULL.getCode(),
+                    StrUtil.format(SystemMsg.EXCEPTION_USER_NULL.getMessage(), username)
+            );
         }
         return ResultVo.success(userModel);
     }