From 10d6587ec3f5c4779f40bcc1afe54d441db68711 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:35:30 +0800
Subject: [PATCH] 报告编制修改
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index ed21b5c..272479d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -1198,8 +1198,7 @@
@Override
public void exportChecked(Map<String, Object> data, HttpServletResponse response) {
// Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- Integer userId = Integer.valueOf(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
- User user = userMapper.selectById(userId);
+ User user = userMapper.selectById(SecurityUtils.getLoginUser().getUserId());
List<String> names = null;
String startTime = "";
String endTime = "";
@@ -1708,7 +1707,7 @@
}
temperatureCyclingList = temperatureCyclingList.stream().distinct().collect(Collectors.toList());
//鏌ヨ鍏ㄨ壊璋憋紝杩囨护鑹叉爣骞舵帓搴�
- List<String> colorList = dictTypeService.selectDictDataByType("color_type").stream()
+ List<String> colorList = dictTypeService.selectDictDataByType("fiber_color_type").stream()
.sorted(Comparator.comparing(SysDictData::getDictSort))
.map(SysDictData::getDictLabel)
.collect(Collectors.toList());
--
Gitblit v1.9.3