fix 申请日志BUG

joying-common/src/main/java/com/fzm/common/interceptor/AuthenticationInterceptor.java

@@ -5,10 +5,14 @@ import com.fzm.common.annotation.Authentication;
 import com.fzm.common.constant.RedisConstant;
 import com.fzm.common.constant.TokenConstant;
 import com.fzm.common.entity.Admin;
+import com.fzm.common.entity.AuthPerson;
 import com.fzm.common.entity.User;
+import com.fzm.common.enums.AuthStatus;
+import com.fzm.common.enums.AuthType;
 import com.fzm.common.enums.ResultCode;
 import com.fzm.common.exception.GlobalException;
 import com.fzm.common.service.AdminService;
+import com.fzm.common.service.AuthPersonService;
 import com.fzm.common.service.UserService;
 import com.fzm.common.utils.JwtUtil;
 import com.fzm.common.utils.RedisUtil;
@@ -34,6 +38,8 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
     private UserService userService;
     @Resource
     private AdminService adminService;
+    @Resource
+    private AuthPersonService authPersonService;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -76,6 +82,15 @@ public class AuthenticationInterceptor implements HandlerInterceptor {
                 redisToken = redisUtil.get(RedisConstant.PORTAL_USER_TOKEN_PREFIX + userId);
                 roleId = null;
                 username = null;
+                if (AuthStatus.SUCCESS.getStatus().equals(user.getAuthStatus())) {
+                    // 个人认证
+                    if (AuthType.PERSON.getType().equals(user.getAuthType())) {
+                        AuthPerson authPerson = authPersonService.getByUserId(user.getId());
+                        username = authPerson.getName();
+                    }
+                    //TODO 企业认证
+                }
+
             } else {
                 // 后台管理用户
                 Admin admin = adminService.getById(userId);

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightLogServiceImpl.java

@@ -26,7 +26,7 @@ public class CopyrightLogServiceImpl extends ServiceImpl<CopyrightLogMapper, Cop
     public void save(Integer cid, CopyrightLogType copyrightLogType, String opInfo) {
         CopyrightLog copyrightLog = new CopyrightLog();
         copyrightLog.setCopyrightId(cid);
-        copyrightLog.setCopyrightId(copyrightLogType.getId());
+        copyrightLog.setOpTypeId(copyrightLogType.getId());
         copyrightLog.setOpType(copyrightLogType.getType());
         copyrightLog.setOpInfo(opInfo);
         copyrightLog.setOpUserId(LoginUserInfo.getLoginUser().getUserId());
@@ -45,7 +45,7 @@ public class CopyrightLogServiceImpl extends ServiceImpl<CopyrightLogMapper, Cop
 
         CopyrightLog copyrightLog = new CopyrightLog();
         copyrightLog.setCopyrightId(cid);
-        copyrightLog.setCopyrightId(logType.getId());
+        copyrightLog.setOpTypeId(logType.getId());
         copyrightLog.setOpType(logType.getType());
         copyrightLog.setOpInfo(opInfo);
         copyrightLog.setOpUserId(0);