From c82b14f3a882698cbca62ef168615d31711320ca Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 15:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
index 5ee5fac..1bb76bd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java
@@ -136,9 +136,9 @@
if (StringUtils.isBlank(request.getLeanDepartId())) {
throw new JeecgBootException("鍊熷叆杞﹂棿涓嶅厑璁镐负绌猴紒");
}
- if (request.getLeanDepartId().equals(equipment.getOrgId())) {
- throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸�熺敤锛�");
- }
+// if (request.getLeanDepartId().equals(equipment.getOrgId())) {
+// throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸�熺敤锛�");
+// }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�");
@@ -168,9 +168,9 @@
if (StringUtils.isBlank(request.getLeanDepartId())) {
throw new JeecgBootException("鍊熷叆杞﹂棿涓嶅厑璁镐负绌猴紒");
}
- if (request.getLeanDepartId().equals(equipment.getOrgId())) {
- throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸�熺敤锛�");
- }
+// if (request.getLeanDepartId().equals(equipment.getOrgId())) {
+// throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸�熺敤锛�");
+// }
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶缂栬緫鍊熺敤璁板綍锛�");
@@ -230,7 +230,7 @@
}
variables.put("proofreading", true);
List<String> usernames = new ArrayList<>();
- usernames.add(equipment.getEquipmentManager());
+// usernames.add(equipment.getEquipmentManager());
variables.put("NextAssignee", usernames);
Result result = flowDefinitionService.startProcessInstanceByKey("equipment_lean_out", variables);
if (result != null) {
@@ -312,15 +312,15 @@
break;
// 褰掕繕
case WAIT_RETURN:
- if (StringUtils.isBlank(equipment.getEquipmentManager())) {
- throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
- }
- List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
- userApprovalList.add(equipment.getEquipmentManager());
+// if (StringUtils.isBlank(equipment.getEquipmentManager())) {
+// throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+// }
+// List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
+// userApprovalList.add(equipment.getEquipmentManager());
values.put("dataId", entity.getId());
values.put("organization", request.getReturnComment());
values.put("comment", request.getReturnComment());
- values.put("NextAssignee", userApprovalList);
+// values.put("NextAssignee", userApprovalList);
request.setComment(request.getReturnComment());
entity.setLeanEndTime(new Date()); //褰掕繕鏃堕棿
//璁剧疆entity
--
Gitblit v1.9.3