wangliang há 4 anos atrás
pai
commit
a1c3cb1884

+ 1 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/AuthUtil.java

@@ -145,6 +145,7 @@ public class AuthUtil {
             throw ExceptionResultEnum.ROLE_ENABLE_AUTHORIZATION.exception();
         }
         request.setAttribute(SystemConstant.SCHOOL, authBean.getSchool());
+        request.setAttribute(SystemConstant.ORG, authBean.getOrg());
 
         //超级系统管理员拥有所有权限
         long count = authBean.getRoleList().stream().filter(s -> s.getType() == RoleTypeEnum.ADMIN).count();

+ 13 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/ServletUtil.java

@@ -159,6 +159,19 @@ public class ServletUtil {
         return object;
     }
 
+    /**
+     * 获取请求的学校
+     *
+     * @return
+     */
+    public static Object getRequestOrg() {
+        Object object = getRequest().getAttribute(SystemConstant.ORG);
+        if (Objects.isNull(object)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return object;
+    }
+
     /**
      * 获取请求的md5
      *

+ 1 - 5
distributed-print-common/src/main/java/com/qmth/distributed/print/common/contant/SystemConstant.java

@@ -31,7 +31,7 @@ public class SystemConstant {
     public static final String SESSION = "session:";
     public static final String USER = "account";
     public static final String SCHOOL = "school";
-    public static final String PARTNER = "partner";
+    public static final String ORG = "org";
     public static final String ERROR = "/error";
     public static final String METHOD = "post";
     public static final String DEFAULT_PASSWORD = "MTIzNDU2";
@@ -41,10 +41,6 @@ public class SystemConstant {
     public static final String LOCAL = "local";
     public static final String OSS = "oss";
     public static final String UPLOAD_TYPE = "uploadType";
-    public static final String FILE = "file";
-    public static final String TASK = "task";
-    public static final String SIZE = "size";
-    public static final String SUMMARY = "summary";
     public static final String HTTP = "http://";
     public static final String ID = "id";
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";