From ffe009e6d341d87bfc606ebdc308805ce78a6540 Mon Sep 17 00:00:00 2001 From: quowingwang Date: Mon, 5 Jan 2026 15:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E4=BB=8A?= =?UTF-8?q?=E5=A4=A9=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RIZO.Admin.WebApi/appsettings.Development.json | 8 ++++---- RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs | 10 +--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/RIZO.Admin.WebApi/appsettings.Development.json b/RIZO.Admin.WebApi/appsettings.Development.json index 50ceec4..0ead192 100644 --- a/RIZO.Admin.WebApi/appsettings.Development.json +++ b/RIZO.Admin.WebApi/appsettings.Development.json @@ -1,8 +1,8 @@ { "dbConfigs": [ { - "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=ay2509055-guiyang-fluorescence-lmes;Port=3308;", - //"Conn": "Data Source=192.168.1.48;User ID=root;Password=123456;Initial Catalog=ay2509055-guiyang-fluorescence-lmes;Port=3306;", + //"Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=ay2509055-guiyang-fluorescence-lmes;Port=3308;", + "Conn": "Data Source=192.168.1.48;User ID=root;Password=123456;Initial Catalog=ay2509055-guiyang-fluorescence-lmes;Port=3306;", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true @@ -12,8 +12,8 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名 - "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog={dbName};Port=3308;", - //"Conn": "Data Source=192.168.1.48;User ID=root;Password=123456;Initial Catalog={dbName};Port=3306;", + //"Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog={dbName};Port=3308;", + "Conn": "Data Source=192.168.1.48;User ID=root;Password=123456;Initial Catalog={dbName};Port=3306;", "DbType": 0, "IsAutoCloseConnection": true, "DbName": "ay2509055-guiyang-fluorescence-lmes" //代码生成默认连接数据库,Oracle库是实例的名称 diff --git a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs index 6edd5e2..f3352db 100644 --- a/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs +++ b/RIZO.Service/Mes/WorkOrderInfo/WorkOrderService.cs @@ -433,15 +433,7 @@ namespace RIZO.Service.Mes.WorkOrderInfo List workOrders = Queryable() .Where(predicate.ToExpression()) .ToList(); - if (workOrders.Any()) - { - return ApiResult.Success(workOrders); - } - else - { - - return new ApiResult(201, "无工单数据"); - } + return ApiResult.Success(workOrders); } catch (Exception ex) {