|  | @@ -190,9 +190,30 @@ func (s *StoreEntry) SystemUserOptions(ctx context.Context, depName string) (*pa
 | 
	
		
			
				|  |  |  		return nil, xerr.Custom("部门已经禁用")
 | 
	
		
			
				|  |  |  	}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +	systemUserDepthRoleList := make([]*model.SystemUserDepthRole, 0)
 | 
	
		
			
				|  |  | +	if err = s.DB.Model(new(model.SystemUserDepthRole)).
 | 
	
		
			
				|  |  | +		Where("FIND_IN_SET(?,depth_ids) > 0", systemDepth.Id).
 | 
	
		
			
				|  |  | +		Where("pasture_id = ?", userModel.AppPasture.Id).
 | 
	
		
			
				|  |  | +		Find(&systemUserDepthRoleList).Error; err != nil {
 | 
	
		
			
				|  |  | +		return nil, xerr.WithStack(err)
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	if len(systemUserDepthRoleList) <= 0 {
 | 
	
		
			
				|  |  | +		return &pasturePb.ConfigOptionsListResponse{
 | 
	
		
			
				|  |  | +			Code: http.StatusOK,
 | 
	
		
			
				|  |  | +			Msg:  "ok",
 | 
	
		
			
				|  |  | +			Data: make([]*pasturePb.ConfigOptionsList, 0),
 | 
	
		
			
				|  |  | +		}, nil
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	userIds := make([]int64, 0)
 | 
	
		
			
				|  |  | +	for _, v := range systemUserDepthRoleList {
 | 
	
		
			
				|  |  | +		userIds = append(userIds, v.UserId)
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  	systemUserList := make([]*model.SystemUser, 0)
 | 
	
		
			
				|  |  |  	if err = s.DB.Table(new(model.SystemUser).TableName()).
 | 
	
		
			
				|  |  | -		Where("FIND_IN_SET(?,dept_ids) > 0", systemDepth.Id).
 | 
	
		
			
				|  |  | +		Where("id IN ?", userIds).
 | 
	
		
			
				|  |  |  		Where("is_delete = ?", pasturePb.IsShow_Ok).
 | 
	
		
			
				|  |  |  		Where("is_show = ? ", pasturePb.IsShow_Ok).
 | 
	
		
			
				|  |  |  		Find(&systemUserList).Error; err != nil {
 |