mirror of
				https://github.com/TeaOSLab/EdgeAPI.git
				synced 2025-11-04 16:00:24 +08:00 
			
		
		
		
	字段中的blob和JSON类型映射为[]byte和dbs.JSON
This commit is contained in:
		@@ -148,8 +148,8 @@ func (this *AdminService) FindEnabledAdmin(ctx context.Context, req *pb.FindEnab
 | 
			
		||||
 | 
			
		||||
	pbModules := []*pb.AdminModule{}
 | 
			
		||||
	modules := []*systemconfigs.AdminModule{}
 | 
			
		||||
	if len(admin.Modules) > 0 && admin.Modules != "null" {
 | 
			
		||||
		err = json.Unmarshal([]byte(admin.Modules), &modules)
 | 
			
		||||
	if len(admin.Modules) > 0 {
 | 
			
		||||
		err = json.Unmarshal(admin.Modules, &modules)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			return nil, err
 | 
			
		||||
		}
 | 
			
		||||
@@ -281,8 +281,8 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA
 | 
			
		||||
	result := []*pb.AdminModuleList{}
 | 
			
		||||
	for _, admin := range admins {
 | 
			
		||||
		modules := []*systemconfigs.AdminModule{}
 | 
			
		||||
		if len(admin.Modules) > 0 && admin.Modules != "null" {
 | 
			
		||||
			err = json.Unmarshal([]byte(admin.Modules), &modules)
 | 
			
		||||
		if len(admin.Modules) > 0 {
 | 
			
		||||
			err = json.Unmarshal(admin.Modules, &modules)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				return nil, err
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user