bug修改

cf-framework/cf-spring-boot-starter-biz-operatelog/src/main/java/com/cf/imes/framework/operatelog/core/aop/OperateLogAspect.java

@@ -88,11 +88,6 @@ public class OperateLogAspect {
     private Object around0(ProceedingJoinPoint joinPoint,
                            com.cf.imes.framework.operatelog.core.annotations.OperateLog operateLog,
                            Operation operation) throws Throwable {
-        // 目前，只有管理员，才记录操作日志！所以非管理员，直接调用，不进行记录
-        Integer userType = WebFrameworkUtils.getLoginUserType();
-        if (!Objects.equals(userType, UserTypeEnum.ADMIN.getValue())) {
-            return joinPoint.proceed();
-        }
 
         // 记录开始时间
         LocalDateTime startTime = LocalDateTime.now();

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/handler/DefaultDBFieldHandler.java

@@ -66,16 +66,18 @@ public class DefaultDBFieldHandler implements MetaObjectHandler {
 
         }
 
-        // 从请求中获取到 Token
-        String authorization = obtainAuthorization(AUTHORIZATION_HEADER_NAME, TOKEN_PARAM_NAME);
 
-        Long organId = null;
 
         /**
          *  用户首次密码登陆的时候，不会有token带入，直接捕捉异常抛出即可，组织ID后续会根据用户登录的组织进行填入，
          *  这里的组织ID字段填入即使为空也可，后续的请求中都会带有token，再从缓存中获取到 token 数据，再获取组织ID，填入即可
          */
+        Long organId = null;
         try {
+            // 从请求中获取到 Token
+            String authorization = obtainAuthorization(AUTHORIZATION_HEADER_NAME, TOKEN_PARAM_NAME);
+
+
             // 获取 token 对应的缓存数据，并得到组织 ID
             OAuth2AccessTokenDO oAuth2AccessTokenDO = get(authorization);
             organId = oAuth2AccessTokenDO.getOrganId();