From 7c943244b310c69af11cf67c2c243eecf73af35e Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 14 Aug 2024 08:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/oss/constant/OssPath.java      | 5 +++++
 .../java/com/njcn/user/service/impl/UserServiceImpl.java  | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java b/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java
index 34b734dde..6762ae20c 100644
--- a/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java
+++ b/pqs-common/common-oss/src/main/java/com/njcn/oss/constant/OssPath.java
@@ -136,4 +136,9 @@ public interface OssPath {
      */
     String ONLINE_REPORT="onlineReport/";
 
+    /**
+     * 系统上传文件至装置内，文件存储路径
+     */
+    String SYSTEM_TO_DEV="systemToDev/";
+
 }
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index dd691a317..034904582 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -290,9 +290,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             //fixme 存在web用户和App用户，目前先通过管理员的登录名来区分开
         } else if (Objects.equals(UserType.ADMINISTRATOR, type) && !Objects.equals(user.getLoginName(), "njcnyw")) {
             type = UserType.USER;
-        } else if (Objects.equals(UserType.ADMINISTRATOR, type) && Objects.equals(user.getLoginName(), "njcnyw")) {
-            type = UserType.APP;
-        } else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) {
+        }
+//        else if (Objects.equals(UserType.ADMINISTRATOR, type) && Objects.equals(user.getLoginName(), "njcnyw")) {
+//            type = UserType.APP;
+//        }
+        else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) {
             return page;
         }
         if (ObjectUtil.isNotNull(queryParam)) {