lyhzzz 5 mēneši atpakaļ
vecāks
revīzija
d40549f911

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

@@ -514,15 +514,7 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(jySceneAuth!=null && jySceneAuth.getAuthType() == 1){
             sceneAuthVo.setViewAuth(true);
         }
-        if(StringUtils.isNotBlank(num)){
 
-            List<String> numList = manageConfig.getNumList();
-            if(numList.contains(num)){
-                sceneAuthVo.setViewAuth(true);
-                sceneAuthVo.setEditAuth(true);
-                return sceneAuthVo;
-            }
-        }
 
 
         List<Case> caseList = null;
@@ -567,6 +559,14 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
         if(sysUserId == null){
             return sceneAuthVo;
         }
+        if(StringUtils.isNotBlank(num)){
+            List<String> numList = manageConfig.getNumList();
+            if(numList.contains(num)){
+                sceneAuthVo.setViewAuth(true);
+                sceneAuthVo.setEditAuth(true);
+                return sceneAuthVo;
+            }
+        }
 
         SysUser byId = sysUserService.getById(sysUserId);
         if(byId.getRoleId() == 1L ){

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -473,7 +473,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setIsShare(true);
             }
             record.setType( param.getType() == null ?setSceneType(record.getSceneSource(),record.getThreeCamType(),record.getSceneType()) : param.getType());
-            if(mapByNumList.get(record.getNum() + toFusionType(record.getType())) != null){
+            if(manageConfig.getNumList().contains(record.getNum()) || mapByNumList.get(record.getNum() + toFusionType(record.getType())) != null){
                 record.setInCase(true);
             }
         }