工控网涉密网联调

yangys

2025-09-29 4c7296d45efe849dc70a3b2e2240c905481a91c9

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveInfoQueryService.java

@@ -13,7 +13,9 @@
import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.system.feign.IUserClient;
@@ -32,7 +34,7 @@
@Service
public class ApproveInfoQueryService {
   @Autowired
   private NcNodeService ncNodeService;
   private NcNodeHisService ncNodeHisService;
   @Autowired
   private HistoryService historyService;
   @Autowired
@@ -99,10 +101,10 @@
      //查询数控程序编号
      Optional<NcProgramApproved> appOpt = programApprovedService.lambdaQuery().eq(NcProgramApproved::getProcessInstanceId, props.getProcessInstanceId()).oneOpt();
      if(appOpt.isEmpty()){
         appInfo.setProgramNo("（未生成）");
         appInfo.setProgramName("（未生成）");
      }else{
         NcNode programPkgNameNode = this.ncNodeService.getById(appOpt.get().getNcNodeId());
         appInfo.setProgramNo(programPkgNameNode.getProgramNo());
         NcNodeHis programPkgNameNode = this.ncNodeHisService.getById(appOpt.get().getNcNodeId());
         appInfo.setProgramName(programPkgNameNode.programName());
      }

      return appInfo;