From f62731e71cb53961be69ab60f8f56cc629c90fbc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 15:10:40 +0800
Subject: [PATCH] 工单生成代码优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 2 +-
ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java | 26 ++++++++++++++++++++------
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 767691e..a81ca14 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -104,7 +104,7 @@
public Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
int total = workOrderList.size();
workOrderList.stream().filter(item -> {
- return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType());
+ return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
});
if (CollectionUtils.isEmpty(workOrderList)) {
return Boolean.TRUE;
diff --git a/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java b/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
index a7fa84f..d3130fd 100644
--- a/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/SecurityUtils.java
@@ -17,7 +17,7 @@
/**
* 瀹夊叏鏈嶅姟宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class SecurityUtils
@@ -35,6 +35,20 @@
catch (Exception e)
{
throw new ServiceException("鑾峰彇鐢ㄦ埛ID寮傚父", HttpStatus.UNAUTHORIZED);
+ }
+ }
+
+ /**
+ * 鑾峰彇杩愮淮鍗曚綅ID
+ *
+ * */
+ public static Integer getUnitId() {
+ try {
+ return getLoginUser().getUser().getUnitId();
+ }
+ catch (Exception e)
+ {
+ throw new ServiceException("鑾峰彇鐢ㄦ埛鍗曚綅寮傚父", HttpStatus.UNAUTHORIZED);
}
}
@@ -118,7 +132,7 @@
/**
* 鏄惁涓虹鐞嗗憳
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 缁撴灉
*/
@@ -129,7 +143,7 @@
/**
* 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
- *
+ *
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
*/
@@ -140,7 +154,7 @@
/**
* 鍒ゆ柇鏄惁鍖呭惈鏉冮檺
- *
+ *
* @param authorities 鏉冮檺鍒楄〃
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
@@ -153,7 +167,7 @@
/**
* 楠岃瘉鐢ㄦ埛鏄惁鎷ユ湁鏌愪釜瑙掕壊
- *
+ *
* @param role 瑙掕壊鏍囪瘑
* @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹�
*/
@@ -166,7 +180,7 @@
/**
* 鍒ゆ柇鏄惁鍖呭惈瑙掕壊
- *
+ *
* @param roles 瑙掕壊鍒楄〃
* @param role 瑙掕壊
* @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹叉潈闄�
--
Gitblit v1.8.0