From 962d64e8e4c6e34b65d188d3caf3b43c181e076d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 16:35:10 +0800
Subject: [PATCH] 过程图返回报备标识
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 62fb564..a4e0441 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -68,10 +68,11 @@
if (Objects.isNull(form.getPointId())) {
throw new RuntimeException("鐐逛綅涓嶈兘涓虹┖");
}
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
// 濡傛灉鏄簨鍓嶆姤澶囬渶瑕佹楠屾槸鍚﹀凡缁忕敓鎴愪笅鍙戝伐鍗�
YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
@@ -116,10 +117,11 @@
@SneakyThrows
@Transactional
public Result importData(ReportForm form) {
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
// 璇诲彇excel鏁版嵁
--
Gitblit v1.8.0