From c72f5d2a4c01a97d39695b3591a4c2f1e4fa67df Mon Sep 17 00:00:00 2001 From: zhangyong <517047165@qq.com> Date: 星期五, 06 九月 2024 10:55:54 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java index 9d0c330..946882a 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java @@ -726,14 +726,6 @@ public void CacheGlassTasks() { JSONObject jsonObject = new JSONObject(); List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory(); -// List<Map<String, Object>> currentCutTerritorys=new ArrayList<>(); -// if(engineerId==null||engineerId.isEmpty()){ -// //璇嗗埆鎽嗙墖 褰撳墠鐗堝浘鏁版嵁 -// currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory(); -// }else{ -// //璇嗗埆鎽嗙墖 姝ngineerId 宸ョ▼鐗堝浘鏁版嵁 -// currentCutTerritorys = edgStorageCageDetailsService.selectCurrentCutTerritory(engineerId); -// } jsonObject.append("currentCutTerritory", currentCutTerritorys); //log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys); //纾ㄨ竟淇℃伅 -- Gitblit v1.8.0