diff --git a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs
index 04544f98..b0baae55 100644
--- a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs
+++ b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs
@@ -28,7 +28,6 @@ public class BusinessPlacePermissionsController
///
///
///
- [Authorize(Roles = "admin,tenant-admin,businessplace-manager")]
[HttpGet("page")]
public async Task> GetPageAsync([FromQuery] BusinessPlacePermissionPageRequest request)
{
@@ -45,7 +44,6 @@ public class BusinessPlacePermissionsController
return await _businessPlacePermissionsService.GetMyAsync();
}
-
///
/// 保存营业点
///
@@ -53,7 +51,7 @@ public class BusinessPlacePermissionsController
///
[Authorize(Roles = "admin,tenant-admin")]
[HttpPost("save")]
- public async Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request)
+ public async Task Save(BusinessPlacePermissionSaveRequest request)
{
await _businessPlacePermissionsService.SaveBusinessPlacePermissionAsync(request);
}
@@ -65,9 +63,9 @@ public class BusinessPlacePermissionsController
///
[Authorize(Roles = "admin,tenant-admin")]
[HttpGet("assignments/{userId}")]
- public async Task> GetBusinessPlacePermissionByUserIdAsyc(int userId)
+ public async Task> GetBusinessPlacePermissionByUserIdAsync(int userId)
{
- return await _businessPlacePermissionsService.GetBusinessPlacePermissionByUserIdAsyc(userId);
+ return await _businessPlacePermissionsService.GetBusinessPlacePermissionByUserIdAsync(userId);
}
///
diff --git a/Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs
index df5236a7..0d86b13f 100644
--- a/Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs
+++ b/Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs
@@ -13,7 +13,7 @@ public interface IBusinessPlacePermissionsService : IScopeDependency
Task> GetMyAsync();
- Task> GetBusinessPlacePermissionByUserIdAsyc(int id);
+ Task> GetBusinessPlacePermissionByUserIdAsync(int id);
Task DeleteAssignmentAsync(int id);
}
diff --git a/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs
index b1354be1..e1277927 100644
--- a/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs
+++ b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs
@@ -1,5 +1,4 @@
-using System.Security.Claims;
-using Dlhis.Basic.Places.Dto;
+using Dlhis.Basic.Places.Dto;
using Dlhis.Basic.Places.Request;
using Dlhis.Basic.Places.Response;
using Dlhis.Entity.Basic.Entity;
@@ -47,10 +46,10 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
public async Task> GetMyAsync()
{
var userId = _currentUser.GetIntSubjectId();
- var role = _currentUser.GetUserClaim(ClaimTypes.Role);
- var isAdmin = role == "admin" || role == "tenant-admin";
+ var role = _currentUser.GetRole();
+ var isAdmin = role is "admin" or "tenant-admin";
- var codes = new List();
+ List codes;
if (isAdmin)
{
codes = await _dbContext.Queryable()
@@ -66,7 +65,6 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
.ToListAsync();
}
-
return await _dbContext.Queryable()
.Where(x => codes.Contains(x.Code))
.Select()
@@ -75,7 +73,7 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
public async Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request)
{
- await _dbContext.Client.Deleteable()
+ await _dbContext.Deleteable()
.Where(x => x.ManagerUserId == request.UserId)
.ExecuteCommandAsync();
@@ -86,16 +84,16 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
}).ToList());
}
- public async Task> GetBusinessPlacePermissionByUserIdAsyc(int id)
+ public async Task> GetBusinessPlacePermissionByUserIdAsync(int id)
{
var infos = await _dbContext.Queryable()
- .LeftJoin((x, bplace) => x.BusinessPlaceCode == bplace.Code)
+ .LeftJoin((x, bPlace) => x.BusinessPlaceCode == bPlace.Code)
.Where(x => x.ManagerUserId == id)
- .Select((x, bplace) => new BusinessPlacePermissionPageResponse
+ .Select((x, bPlace) => new BusinessPlacePermissionPageResponse
{
UserId = x.ManagerUserId,
BusinessPlaceCode = x.BusinessPlaceCode,
- BusinessPlaceName = bplace.Name,
+ BusinessPlaceName = bPlace.Name,
})
.ToListAsync();
@@ -109,6 +107,6 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
public async Task DeleteAssignmentAsync(int id)
{
- await _dbContext.Client.Deleteable().Where(x => x.Id == id).ExecuteCommandAsync();
+ await _dbContext.Deleteable().Where(x => x.Id == id).ExecuteCommandAsync();
}
}
\ No newline at end of file
diff --git a/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs
index 895fe2ef..61327f3a 100644
--- a/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs
+++ b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs
@@ -31,9 +31,8 @@ public class BusinessPlaceService : IBusinessPlaceService
var page = await _dbContext.Queryable()
.LeftJoin((x, ps) => x.Code == ps.PlaceCode)
.LeftJoin((x, ps, s) => s.Code == ps.ShiftCode)
- .WhereIF(request.Search.IsPresent(), x => x.CustomCode.Contains(request.Search)
- || x.Code.ToString().Contains(request.Search)
- || x.Name.Contains(request.Search))
+ .WhereIF(request.Search.IsPresent(), x => x.CustomCode == request.Search
+ || x.Name == request.Search)
.WhereIF(request.Catalog.HasValue, x => x.Catalog == request.Catalog)
.WhereIF(request.Status.HasValue, x => x.Status == request.Status)
.WhereIF(request.Source.HasValue, x => x.Source == request.Source)
diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
index a24d6402..45694dc3 100644
--- a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
@@ -1,4 +1,5 @@
-using Kurisu.AspNetCore.DataAccess.SqlSugar;
+using Kurisu.AspNetCore.DataAccess.Entity;
+using Kurisu.AspNetCore.DataAccess.SqlSugar;
using Mapster;
using SqlSugar;
@@ -8,7 +9,7 @@ namespace Dlhis.Entity.Basic.Entity;
/// 营业点管理
///
[SugarTable(TableName = "BusinessPlaceManagerRelationship", TableDescription = "营业点管理关系")]
-public class BusinessPlaceManagerRelationshipEntity : SugarBaseEntity
+public class BusinessPlaceManagerRelationshipEntity : SugarBaseEntity , ITenantId
{
///
/// 管理人员
@@ -22,4 +23,8 @@ public class BusinessPlaceManagerRelationshipEntity : SugarBaseEntity
///
[SugarColumn(ColumnDescription = "营业点", IsNullable = false)]
public Guid BusinessPlaceCode { get; set; }
+
+
+ ///
+ public string TenantId { get; set; }
}