소스 검색

授权记录授权场景的userId

lyhzzz 1 년 전
부모
커밋
0dc8a5569f

+ 2 - 0
src/main/java/com/fdkankan/manage/service/IJyUserService.java

@@ -26,4 +26,6 @@ public interface IJyUserService extends IService<JyUser> {
     HashMap<Long, JyUser> getMapByUserIds(Set<Long> userIds);
 
     JyUser getBySysId(Object loginId);
+
+    JyUser getByUserId(Long sceneUserId);
 }

+ 5 - 7
src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -152,21 +152,19 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
-        if(pro != null && pro.getUserId().equals(jyUser.getUserId())){
-            throw new BusinessException(ResultCode.AUTH_ERROR);
-        }
-        if(plus != null && plus.getUserId().equals(jyUser.getUserId())){
+        Long sceneUserId = pro == null ? plus.getUserId():pro.getUserId();
+
+        if(sceneUserId.equals(jyUser.getUserId())){
             throw new BusinessException(ResultCode.AUTH_ERROR);
         }
+        JyUser sceneJyUser = jyUserService.getByUserId(sceneUserId);
 
         JySceneUserAuth auth = this.getByNumAndJyUserId(jyUser.getId(),param.getNum());
         if(auth != null){
             param.setId(auth.getId());
         }
         param.setJyUserId(jyUser.getId());
-        SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
-        JyUser loginUser = jyUserService.getBySysId(byId.getId());
-        param.setAuthorId(loginUser.getId());
+        param.setAuthorId(sceneJyUser.getId());
         this.saveOrUpdate(param);
 
     }

+ 7 - 0
src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -73,4 +73,11 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
         wrapper.eq(JyUser::getSysUserId,loginId);
         return this.getOne(wrapper);
     }
+
+    @Override
+    public JyUser getByUserId(Long sceneUserId) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUser::getUserId,sceneUserId);
+        return this.getOne(wrapper);
+    }
 }