lyhzzz 1 年之前
父節點
當前提交
cc98d1529c

+ 4 - 4
src/main/java/com/fdkankan/manage_jp/controller/LaserController.java

@@ -49,10 +49,10 @@ public class LaserController extends BaseController{
         if(user == null){
             return Result.success(false);
         }
-        List<String> coldLogNumList = tmColdStorageService.getNumListColdLog(sceneNum);
-        if(coldLogNumList.contains(sceneNum)){
-            return Result.success(false);
-        }
+//        List<String> coldLogNumList = tmColdStorageService.getNumListColdLog(sceneNum);
+//        if(coldLogNumList.contains(sceneNum)){
+//            return Result.success(false);
+//        }
         Set<Long> roleIds = userRoleService.getByUser(user);
         if(roleIds.contains(5L)){
             return Result.success(true);

+ 4 - 4
src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -140,7 +140,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(param.getType() == 2){
             ssSceneMap = laserService.list(sceneNumList);
         }
-        HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
+        //HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
 
         for (SceneVo record : page.getRecords()) {
             if(param.getType() == 2){
@@ -166,9 +166,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setIsMain(false);
                 record.setIsDel(false);
             }
-            if(coldMap.get(record.getNum())!=null){
-                record.setColdStorage(coldMap.get(record.getNum()));
-            }
+//            if(coldMap.get(record.getNum())!=null){
+//                record.setColdStorage(coldMap.get(record.getNum()));
+//            }
         }
         return PageInfo.PageInfo(page);
     }