Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-03 c82b14f3a882698cbca62ef168615d31711320ca

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java

@@ -357,15 +357,15 @@
            case UNDER_MAINTENANCE:
                //执行完成
                //设备管理员确认
                String equipmentManager = equipment.getEquipmentManager();
                if(StringUtils.isBlank(equipmentManager)) {
                    throw new JeecgBootException("设备未分配设备管理员，无法进入下级审批！");
                }
                userApprovalList = Collections.singletonList(equipmentManager);
//                String equipmentManager = equipment.getEquipmentManager();
//                if(StringUtils.isBlank(equipmentManager)) {
//                    throw new JeecgBootException("设备未分配设备管理员，无法进入下级审批！");
//                }
//                userApprovalList = Collections.singletonList(equipmentManager);
                values.put("dataId", entity.getId());
                values.put("organization", "二保执行结束");
                values.put("comment", "二保执行结束");
                values.put("NextAssignee", userApprovalList);
//                values.put("NextAssignee", userApprovalList);
                request.setComment("二保执行结束");
                //设置entity
                entity.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_CONFIRM.name());
@@ -389,7 +389,7 @@
                eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.SECOND_MAINTENANCE_WAIT_CONFIRM.name());
                break;
            case WAIT_CONFIRM:
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(),null, BusinessCodeConst.PCR0003);
                if (CollectionUtil.isEmpty(userSelectors)) {
                    throw new JeecgBootException("设备未分配给车间班组长，无法进入下级审批！");
                }