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/EamEquipmentTransferServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
index b25c467..29f710c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentTransferServiceImpl.java
@@ -140,10 +140,10 @@
if (sysUser == null) {
throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶娣诲姞鍊熺敤璁板綍锛�");
}
- if (equipment.getOrgId().equals(request.getNewDepartId())) {
- throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸彉鍔紒");
- }
- request.setOldDepartId(equipment.getOrgId());
+// if (equipment.getOrgId().equals(request.getNewDepartId())) {
+// throw new JeecgBootException("褰撳墠璁惧灞炰簬姝よ溅闂达紝涓嶉渶瑕佸彉鍔紒");
+// }
+// request.setOldDepartId(equipment.getOrgId());
request.setReportUser(sysUser.getUsername());
return equipmentTransferMapper.insert(request) > 0;
}
@@ -185,7 +185,7 @@
variables.put("comment", entity.getTransferReason());
variables.put("proofreading", true);
// 鍒嗛厤缁欒澶囩鐞嗗憳
- List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(),null, BusinessCodeConst.PCR0004);
if (CollectionUtil.isEmpty(userSelectors)) {
throw new JeecgBootException("璁惧鏈垎閰嶇粰璁惧绠＄悊鍛橈紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
}
@@ -305,7 +305,7 @@
updateWrapper.set("equipment_id", request.getEquipmentId());
updateWrapper.set("remark", request.getRemark());
updateWrapper.set("transfer_reason", request.getTransferReason());
- updateWrapper.set("old_depart_id", equipment.getOrgId());
+// updateWrapper.set("old_depart_id", equipment.getOrgId());
updateWrapper.set("new_depart_id", request.getNewDepartId());
updateWrapper.eq("id", request.getId());
updateWrapper.eq("report_user", sysUser.getUsername());
--
Gitblit v1.9.3