system: 关闭打印生sql日志

model/system_pasture_permissions.go → model/system_group_pasture_permissions.go

@@ -2,7 +2,7 @@ package model
 
 import operationPb "kpt-tmr-group/proto/go/backend/operation"
 
-type SystemPasturePermissions struct {
+type SystemGroupPasturePermissions struct {
 	Id        int64                   `json:"id,omitempty"`
 	RoleId    int64                   `json:"role_id"`
 	PastureId int64                   `json:"pasture_id"`
@@ -11,14 +11,14 @@ type SystemPasturePermissions struct {
 	UpdatedAt int64                   `json:"updated_at"`
 }
 
-func (s *SystemPasturePermissions) TableName() string {
-	return "system_pasture_permissions"
+func (s *SystemGroupPasturePermissions) TableName() string {
+	return "system_group_pasture_permissions"
 }
 
-func NewSystemPasturePermissions(roleID int64, pastureIds []int64) []*SystemPasturePermissions {
-	systemPasturePermissions := make([]*SystemPasturePermissions, len(pastureIds))
+func NewSystemGroupPasturePermissions(roleID int64, pastureIds []int64) []*SystemGroupPasturePermissions {
+	systemPasturePermissions := make([]*SystemGroupPasturePermissions, len(pastureIds))
 	for i, v := range pastureIds {
-		systemPasturePermissions[i] = &SystemPasturePermissions{
+		systemPasturePermissions[i] = &SystemGroupPasturePermissions{
 			RoleId:    roleID,
 			PastureId: v,
 			IsShow:    operationPb.IsShow_OK,

module/backend/system_permissions.go

@@ -13,7 +13,7 @@ import (
 )
 
 type SystemAllPermissionsList struct {
-	PastureList []*model.SystemPasturePermissions
+	PastureList []*model.SystemGroupPasturePermissions
 	MenuList    []*model.SystemMenuPermissions
 	MobileList  []*model.SystemMobilePermissions
 }
@@ -130,7 +130,7 @@ func (s *StoreEntry) SystemPermissionsFormatPb(pastureList []*model.GroupPasture
 // GetSystemAllPermissionsList 获取用户相关权限
 func (s *StoreEntry) GetSystemAllPermissionsList(ctx context.Context, roleId int64) *SystemAllPermissionsList {
 	systemAllPermissionsList := &SystemAllPermissionsList{
-		PastureList: make([]*model.SystemPasturePermissions, 0),
+		PastureList: make([]*model.SystemGroupPasturePermissions, 0),
 		MenuList:    make([]*model.SystemMenuPermissions, 0),
 		MobileList:  make([]*model.SystemMobilePermissions, 0),
 	}
@@ -138,8 +138,9 @@ func (s *StoreEntry) GetSystemAllPermissionsList(ctx context.Context, roleId int
 	wg := sync.WaitGroup{}
 	wg.Add(3)
 	go func() {
-		pastureList := make([]*model.SystemPasturePermissions, 0)
-		if err := s.DB.Where("role_id = ?", roleId).Find(&pastureList).Error; err != nil {
+
+		pastureList := make([]*model.SystemGroupPasturePermissions, 0)
+		if err := s.DB.Where("role_id = ? and is_show = ?", roleId, operationPb.IsShow_OK).Find(&pastureList).Error; err != nil {
 			zaplog.Error("SystemPasturePermissions", zap.Any("Err", err))
 		}
 		systemAllPermissionsList.PastureList = pastureList
@@ -148,7 +149,7 @@ func (s *StoreEntry) GetSystemAllPermissionsList(ctx context.Context, roleId int
 
 	go func() {
 		menuList := make([]*model.SystemMenuPermissions, 0)
-		if err := s.DB.Where("role_id = ?", roleId).Find(&menuList).Error; err != nil {
+		if err := s.DB.Where("role_id = ? and is_show = ?", roleId, operationPb.IsShow_OK).Find(&menuList).Error; err != nil {
 			zaplog.Error("SystemMenuPermissions", zap.Any("Err", err))
 		}
 		systemAllPermissionsList.MenuList = menuList
@@ -158,7 +159,7 @@ func (s *StoreEntry) GetSystemAllPermissionsList(ctx context.Context, roleId int
 	// 获取供应商数据
 	go func() {
 		mobileList := make([]*model.SystemMobilePermissions, 0)
-		if err := s.DB.Where("role_id = ?", roleId).Find(&mobileList).Error; err != nil {
+		if err := s.DB.Where("role_id = ? and is_show = ?", roleId, operationPb.IsShow_OK).Find(&mobileList).Error; err != nil {
 			zaplog.Error("SystemMobilePermissions", zap.Any("Err", err))
 		}
 		systemAllPermissionsList.MobileList = mobileList
@@ -169,15 +170,16 @@ func (s *StoreEntry) GetSystemAllPermissionsList(ctx context.Context, roleId int
 }
 
 // GetPastureList 获取******
-func (s *StoreEntry) GetPastureList(ctx context.Context, req []*model.SystemPasturePermissions) ([]*model.GroupPasture, error) {
+func (s *StoreEntry) GetPastureList(ctx context.Context, req []*model.SystemGroupPasturePermissions) ([]*model.GroupPasture, error) {
 	ids := make([]int64, 0)
 	for _, v := range req {
 		ids = append(ids, v.PastureId)
 	}
-
 	groupPastureList := make([]*model.GroupPasture, 0)
-	if err := s.DB.Find(&groupPastureList, ids).Error; err != nil {
-		return nil, xerr.WithStack(err)
+	if len(ids) > 0 {
+		if err := s.DB.Where("is_show = ?", operationPb.IsShow_OK).Find(&groupPastureList, ids).Error; err != nil {
+			return nil, xerr.WithStack(err)
+		}
 	}
 	return groupPastureList, nil
 }
@@ -190,9 +192,12 @@ func (s *StoreEntry) GetMenuList(ctx context.Context, req []*model.SystemMenuPer
 	}
 
 	menuList := make([]*model.SystemMenu, 0)
-	if err := s.DB.Find(&menuList, ids).Error; err != nil {
-		return nil, xerr.WithStack(err)
+	if len(ids) > 0 {
+		if err := s.DB.Where("is_show = ?", operationPb.IsShow_OK).Find(&menuList, ids).Error; err != nil {
+			return nil, xerr.WithStack(err)
+		}
 	}
+
 	return menuList, nil
 }
 
@@ -202,10 +207,12 @@ func (s *StoreEntry) GetMobileList(ctx context.Context, req []*model.SystemMobil
 	for _, v := range req {
 		ids = append(ids, v.MobileId)
 	}
-
 	mobileList := make([]*model.SystemMobile, 0)
-	if err := s.DB.Find(&mobileList, ids).Error; err != nil {
-		return nil, xerr.WithStack(err)
+	if len(ids) > 0 {
+		if err := s.DB.Where("is_show = ?", operationPb.IsShow_OK).Find(&mobileList, ids).Error; err != nil {
+			return nil, xerr.WithStack(err)
+		}
 	}
+
 	return mobileList, nil
 }

module/backend/system_service.go

@@ -207,12 +207,12 @@ func (s *StoreEntry) GetSystemUserPermissions(ctx context.Context, token string)
 
 	// 获取用户角色数据
 	systemRoles := make([]*model.SystemRole, 0)
-	if err = s.DB.Find(&systemRoles, roleIds).Error; err != nil {
+	if err = s.DB.Where("is_show = ?", operationPb.IsShow_OK).Find(&systemRoles, roleIds).Error; err != nil {
 		return nil, xerr.WithStack(err)
 	}
 
 	systemAllPermissionsList := &SystemAllPermissionsList{
-		PastureList: make([]*model.SystemPasturePermissions, 0),
+		PastureList: make([]*model.SystemGroupPasturePermissions, 0),
 		MenuList:    make([]*model.SystemMenuPermissions, 0),
 		MobileList:  make([]*model.SystemMobilePermissions, 0),
 	}
@@ -269,7 +269,7 @@ func (s *StoreEntry) CreateSystemRole(ctx context.Context, req *operationPb.AddR
 
 		// 创建角色牧场端权限数据
 		if len(req.PastureId) > 0 {
-			pasturePermissions := model.NewSystemPasturePermissions(role.Id, req.PastureId)
+			pasturePermissions := model.NewSystemGroupPasturePermissions(role.Id, req.PastureId)
 			if err := tx.Create(pasturePermissions).Error; err != nil {
 				return xerr.WithStack(err)
 			}