OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: update tenancy failed

Browse Source
This commit is contained in:
simonzhangsz
2024-06-25 17:06:04 +08:00
parent 0faeb1e0ca
commit 267904be29
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/system/controller/sys_tenant.go
View File

@@ -141,7 +141,7 @@ func (s *SysTenantController) Add(c *gin.Context) {
return
}
} else {
uniqueTenancy := s.sysTenantService.IsUniqueTenancy(body.TenancyType, body.TenancyKey)
uniqueTenancy := s.sysTenantService.IsUniqueTenancy(body.TenantID, body.TenancyType, body.TenancyKey)
if !uniqueTenancy {
// 租赁对象添加失败，租赁对象已存在
msg := i18n.TTemplate(language, "Tenancy object is exist", map[string]any{"key": body.TenancyKey})
@@ -206,7 +206,7 @@ func (s *SysTenantController) Edit(c *gin.Context) {
return
}
} else {
uniqueTenancy := s.sysTenantService.IsUniqueTenancy(body.TenancyType, body.TenancyKey)
uniqueTenancy := s.sysTenantService.IsUniqueTenancy(body.TenantID, body.TenancyType, body.TenancyKey)
if !uniqueTenancy {
// 租赁对象添加失败，租赁对象已存在
msg := i18n.TTemplate(language, "Tenancy object is exist", map[string]any{"key": body.TenancyKey})

2
src/modules/system/model/sys_tenant.go
View File

@@ -9,7 +9,7 @@ type SysTenant struct {
// 祖级列表
Ancestors string `json:"ancestors"`
// 租户名称
TenantName string `json:"tenantName" binding:"required"`
TenantName string `json:"tenantName"`
// 显示顺序
OrderNum int `json:"orderNum"`
// tenancy type: sd-sst, apn, imsi, msisdn

4
src/modules/system/repository/sys_tenant.impl.go
View File

@@ -236,6 +236,10 @@ func (r *SysTenantImpl) IsUniqueTenancy(sysTenant model.SysTenant) bool {
// 查询条件拼接
var conditions []string
var params []any
if sysTenant.TenantID != "" {
conditions = append(conditions, "tenant_id != ?")
params = append(params, sysTenant.TenantID)
}
if sysTenant.TenancyType != "" {
conditions = append(conditions, "tenancy_type = ?")
params = append(params, sysTenant.TenancyType)

2
src/modules/system/service/sys_tenant.go
View File

@@ -26,7 +26,7 @@ type ISysTenant interface {
CheckUniqueTenantName(tenantName, parentId, tenantId string) bool
// check unique tenancy_type and tenancy_key
IsUniqueTenancy(tenancyType, tenancyKey string) bool
IsUniqueTenancy(tenantID, tenancyType, tenancyKey string) bool
// InsertTenant 新增租户信息
InsertTenant(sysTenant model.SysTenant) string

3
src/modules/system/service/sys_tenant.impl.go
View File

@@ -74,8 +74,9 @@ func (r *SysTenantImpl) CheckUniqueTenantName(tenantName, parentId, tenantId str
}
// CheckUniqueTenantName 校验同级部门名称是否唯一
func (r *SysTenantImpl) IsUniqueTenancy(tenancyType, tenancyKey string) bool {
func (r *SysTenantImpl) IsUniqueTenancy(tenantID, tenancyType, tenancyKey string) bool {
return r.sysTenantRepository.IsUniqueTenancy(model.SysTenant{
TenantID: tenantID,
TenancyType: tenancyType,
TenancyKey: tenancyKey,
})