feat：完善项目信息

app/api/admin/api/role.go

@@ -32,7 +32,7 @@ func (*Role) Select(c *gin.Context) {
 func (*Role) Add(c *gin.Context) {
 	form := &struct {
 		Name   string `json:"name" form:"name" binding:"required"`
-		Remark string `json:"remark" form:"remark" binding:"required"`
+		Remark string `json:"remark" form:"remark"`
 		Sort   int    `json:"sort" form:"sort"`
 	}{}
 	if err := api.Bind(form)(c); err != nil {
@@ -47,7 +47,7 @@ func (*Role) Edit(c *gin.Context) {
 	form := &struct {
 		api.IDStringForm
 		Name   string `json:"name" form:"name" binding:"required"`
-		Remark string `json:"remark" form:"remark" binding:"required"`
+		Remark string `json:"remark" form:"remark"`
 		Sort   int    `json:"sort" form:"sort"`
 	}{}
 	if err := api.Bind(form)(c); err != nil {

app/api/admin/controller/role/auth.go

@@ -92,11 +92,14 @@ func (c *Auth) Bind(roleID uint64, authIDs []uint64) error {
 		if err = model2.Creates(mSysRoleAuth.SysRoleAuth, data); err != nil {
 			return err
 		}
-		permission.AddRequest(request)
+		if len(request) > 0 {
+			permission.AddRequest(request)
 
-		_, err = permission.AddPolicies()
-
-		return err
+			if _, err = permission.AddPolicies(); err != nil {
+				return err
+			}
+		}
+		return nil
 	})
 }
 

app/api/admin/controller/role/menu.go

@@ -85,11 +85,14 @@ func (c *Menu) Bind(roleID uint64, menuIDs []uint64) error {
 		if err = model2.Creates(mSysRoleMenu.SysRoleMenu, data, tx); err != nil {
 			return err
 		}
-		permission.AddRequest(request)
+		if len(request) > 0 {
+			permission.AddRequest(request)
 
-		_, err = permission.AddPolicies()
-
-		return err
+			if _, err = permission.AddPolicies(); err != nil {
+				return err
+			}
+		}
+		return nil
 	})
 }
 

app/api/admin/controller/tenant/instance.go

@@ -8,8 +8,12 @@ import (
 	"SciencesServer/app/service"
 	"SciencesServer/app/session"
 	config2 "SciencesServer/config"
+	"SciencesServer/serve/logger"
+	"SciencesServer/serve/orm"
 	"SciencesServer/utils"
 	"errors"
+	"fmt"
+	"gorm.io/gorm"
 )
 
 type Instance struct {
@@ -115,8 +119,19 @@ func (c *Instance) Delete(id uint64) error {
 	} else if !isExist {
 		return errors.New("操作错误，平台信息不存在或已被删除")
 	}
-	if err = model2.Delete(mSysTenant.SysTenant); err != nil {
-		return err
+	if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		if err = model2.Delete(mSysTenant.SysTenant); err != nil {
+			return err
+		}
+		if _, err = service.NewPermission(
+			service.WithAuthTenant(fmt.Sprintf("%d", id)),
+		).RemoveFilteredGroupingPolicy(); err != nil {
+			logger.ErrorF("Casbin 删除租户【%d】下权限信息错误：%v", id, err)
+			return err
+		}
+		return nil
+	}); err != nil {
+		return nil
 	}
 	service.Publish(config2.EventForRedisHashDestroy, config2.RedisKeyForTenant, mSysTenant.Domain)
 	return nil