Merge remote-tracking branch 'origin/thirdStage' into thirdStage

This commit is contained in:
yjz
2024-01-23 14:11:05 +08:00
@@ -269,9 +269,7 @@ public class ProcessESChangeEndListener implements ExecutionListener {
private void genModificationOrderNumber(ProcessEsChange change) {
String deptCode = "U";
// 找到单位代号
String createBy = change.getCreateBy();
SysUser createUser = sysUserService.getUserByName(createBy);
String deptId = sysUserDepartService.getFirstDeptIdByUserId(createUser.getId());
String deptId = change.getMainDraftingUnit();
SysDepart dept = sysDepartService.getById(deptId);
if (dept != null) {
String deptName = dept.getDepartName();