修复bug

src/main/java/com/fdkankan/manage/entity/JySceneUserAuth.java

@@ -11,6 +11,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 /**
  * <p>
@@ -22,6 +23,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
+@ToString
 @TableName("jy_scene_user_auth")
 public class JySceneUserAuth implements Serializable {
 

src/main/java/com/fdkankan/manage/entity/JyUser.java

@@ -65,5 +65,6 @@ public class JyUser implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField("status")
+    private Integer status;
 }

src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -309,6 +309,11 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         }
 
         SysUser byId = sysUserService.getById(result.getId());
+        if(byId.getRoleId() == 1L || byId.getRoleId() == 45L){
+            sceneAuthVo.setViewAuth(true);
+            sceneAuthVo.setEditAuth(true);
+            return sceneAuthVo;
+        }
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
         if(jySceneAuth != null  && jySceneAuth.getAuthType() == 0){
             JySceneUserAuth jySceneUserAuth = jySceneUserAuthService.getByNumAndJyUserId(jyUser.getId(), num);

src/main/java/com/fdkankan/manage/service/impl/JyUserServiceImpl.java

@@ -42,6 +42,7 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
 
         LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.notIn(JyUser::getRyId,"super-admin","admin");
+        wrapper.eq(JyUser::getStatus,1);
         if(StringUtils.isNotBlank(ryId)){
             wrapper.like(JyUser::getRyId,ryId);
         }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -347,7 +347,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     record.setIsCopy(true);
                 }
             }
-            if( byId.getRoleId() == 1L || jyUser.getUserId().equals(record.getUserId())){
+            if( byId.getRoleId() == 1L || byId.getRoleId() == 45L || jyUser.getUserId().equals(record.getUserId())){
                 record.setIsAuth(true);
                 record.setEditAuth(1);
                 record.setIsAuthOther(true);

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -275,5 +275,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         wrapper.set(SysUser::getStatus,userParam.getStatus());
         sysUserService.update(wrapper);
 
+        LambdaUpdateWrapper<JyUser> wrapper2 = new LambdaUpdateWrapper<>();
+        wrapper2.eq(JyUser::getId,jyuser.getId());
+        wrapper2.set(JyUser::getStatus,userParam.getStatus());
+        jyUserService.update(wrapper2);
+
     }
 }