Browse Source

update001

qiangxuan 7 months ago
parent
commit
0d35df7d1a

+ 1 - 0
zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/service/impl/FpgLeanModelServiceImpl.java

@@ -257,6 +257,7 @@ public class FpgLeanModelServiceImpl extends ServiceImpl<FpgLeanModelMapper, Fpg
             }
             jsonResult = JSON.parseArray(JSON.toJSONString(modelDataResults));
         }
+        log.info("{}{}", "积木报表导出总数:", jsonResult.size());
         result.put("data", jsonResult);
         return result;
     }

+ 1 - 1
zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenConfigController.java

@@ -139,7 +139,7 @@ public class LargeScreenConfigController extends JeecgController<LargeScreenConf
 													 @RequestParam(name="largeScreenCode", required = false) String largeScreenCode) {
 		LargeScreenConfig largeScreenConfig = largeScreenConfigService.getLargeScreenConfigById(id, largeScreenCode);
 		if(largeScreenConfig==null) {
-			return Result.error("未找到对应数据");
+			return Result.OK(new LargeScreenConfig());
 		}
 		return Result.OK(largeScreenConfig);
 	}