yangys
2025-09-22 c0ccbb980be6975389f09ad13dcabd7d3156dae3
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
@@ -48,13 +48,14 @@
   public R<IPage<NcProgramExportDncPageVO>> page(NcProgramExportDncQueryVO query) {
      String userRole = AuthUtil.getUserRole();//角色别名,多个角色逗号分隔
      List<String> userRoleAliasList = Func.toStrList(",", userRole);
      /*
      String managerRole = paramService.getProgramManagerRoleAlias();
      if(!userRoleAliasList.contains(managerRole) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
         //非数控管理员角色、管理员,限制未只能导出自己的程序
         query.setUserId(AuthUtil.getUserId());
      }
      }*/
      query.setUserId(AuthUtil.getUserId());
      query.setUserDeptIds(Func.toLongList(AuthUtil.getDeptId()));
      return R.data(ncProgramApprovedService.exportDncPageQuery(query));
   }
@@ -68,7 +69,6 @@
      //导出文件名称要求导出人名字+时间戳
      String uname = UrlUtil.encode(AuthUtil.getNickName());
      //String filename =AuthUtil.getNickName()+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
      String filename = uname+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
      response.setHeader("Content-Disposition", "attachment; filename="+filename);
      response.setContentType("application/octet-stream;charset=utf-8");