From 60f0e2e1eb68d57a856494f45e487279ead8eef6 Mon Sep 17 00:00:00 2001 From: zpc Date: Thu, 21 Aug 2025 17:31:43 +0800 Subject: [PATCH] 333 --- .../Controllers/Business/OdfRoomsController.cs | 11 ++++++++++- ZR.Admin.WebApi/appsettings.json | 8 +++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs index cab1dd1..c767fe0 100644 --- a/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs +++ b/ZR.Admin.WebApi/Controllers/Business/OdfRoomsController.cs @@ -217,6 +217,11 @@ namespace ZR.Admin.WebApi.Controllers.Business var list = sysDeptService.AsQueryable().Where(it => it.ParentId == dept.DeptId).Select(it => new { it.DeptId, it.DeptName }).ToList(); return SUCCESS(list); } + if (dept == null) + { + var list = sysDeptService.AsQueryable().Where(it => it.ParentId == 1).Select(it => new { it.DeptId, it.DeptName }).ToList(); + return SUCCESS(list); + } return SUCCESS(new List()); } @@ -233,6 +238,10 @@ namespace ZR.Admin.WebApi.Controllers.Business public IActionResult GetRegion([FromQuery] int deptId) { var list = sysDeptService.AsQueryable().Where(it => it.ParentId == deptId).Select(it => new { it.DeptId, it.DeptName }).ToList(); + if (list == null) + { + list = sysDeptService.AsQueryable().Where(it => it.DeptId == deptId).Select(it => new { it.DeptId, it.DeptName }).ToList(); + } return SUCCESS(list); } @@ -353,7 +362,7 @@ namespace ZR.Admin.WebApi.Controllers.Business PortNumber = port + 1, OpticalAttenuation = "", HistoryRemarks = "", - OpticalCableOffRemarks ="", + OpticalCableOffRemarks = "", Remarks = "", Status = parm.DefaultStatus, UpdatedAt = DateTime.Now, diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 4ec8895..e1f62b0 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -7,8 +7,14 @@ } }, "dbConfigs": [ + //{ + // "Conn": "Data Source=192.168.195.8;User ID=sa;Password=Dbt@com@123;Initial Catalog=OdtAdmin;Encrypt=True;TrustServerCertificate=True;", + // "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 + // "ConfigId": "0", //多租户唯一标识 + // "IsAutoCloseConnection": true + //} { - "Conn": "Data Source=192.168.195.8;User ID=sa;Password=Dbt@com@123;Initial Catalog=OdtAdmin;Encrypt=True;TrustServerCertificate=True;", + "Conn": "Data Source=49.233.115.141;User ID=sa;Password=Dbt@com@123;Initial Catalog=OdtAdmin;Encrypt=True;TrustServerCertificate=True;", "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true