wangliang 4 years ago
parent
commit
77ab375aab

+ 1 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java

@@ -249,10 +249,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public boolean saveUserCommon(UserSaveParams userSaveParams) {
         boolean isSuccess = true;
         try {
-            Long schoolId = null;
-            if (Objects.nonNull(ServletUtil.getRequestHeaderSchoolId())) {
-                schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-            }
+            Long schoolId = Objects.nonNull(ServletUtil.getRequestHeaderSchoolIdByNotVaild()) ? Long.valueOf(ServletUtil.getRequestHeaderSchoolIdByNotVaild().toString()) : null;
             SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
             Gson gson = new Gson();
             userSaveParams.setSchoolId(schoolId);

+ 11 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/ServletUtil.java

@@ -152,12 +152,20 @@ public class ServletUtil {
      */
     public static Object getRequestHeaderSchoolId() {
         Object object = getRequest().getHeader(SystemConstant.SCHOOL_ID);
-//        if (Objects.isNull(object)) {
-//            throw ExceptionResultEnum.NOT_LOGIN.exception();
-//        }
+        if (Objects.isNull(object)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
         return object;
     }
 
+    /**
+     * 获取header中schoolId
+     * @return
+     */
+    public static Object getRequestHeaderSchoolIdByNotVaild() {
+        return getRequest().getHeader(SystemConstant.SCHOOL_ID);
+    }
+
     /**
      * 获取请求的学校
      *