|  | @@ -8,6 +8,7 @@ package services
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import (
 | 
	
		
			
				|  |  |  	"encoding/json"
 | 
	
		
			
				|  |  | +	"errors"
 | 
	
		
			
				|  |  |  	"fmt"
 | 
	
		
			
				|  |  |  	"strconv"
 | 
	
		
			
				|  |  |  	"time"
 | 
	
	
		
			
				|  | @@ -25,6 +26,7 @@ type GroupService interface {
 | 
	
		
			
				|  |  |  	GetAll() (dataList []viewmodels.Group, total int64)
 | 
	
		
			
				|  |  |  	Add(dataVM viewmodels.Group) error
 | 
	
		
			
				|  |  |  	Update(dataVM viewmodels.Group, id int) error
 | 
	
		
			
				|  |  | +	Delete(id int) error
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  //返回service操作类
 | 
	
	
		
			
				|  | @@ -86,6 +88,31 @@ func (s *groupService) Update(dataVM viewmodels.Group, id int) error {
 | 
	
		
			
				|  |  |  	return nil
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +//移除标段成员
 | 
	
		
			
				|  |  | +func (s *groupService) Delete(id int) error {
 | 
	
		
			
				|  |  | +	// 1.检查权限组合法性
 | 
	
		
			
				|  |  | +	groupData := s.dao.Get(id)
 | 
	
		
			
				|  |  | +	if groupData.Id == 0 {
 | 
	
		
			
				|  |  | +		return errors.New("添加的账号不合法")
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	// 2.权限组下是否有管理员
 | 
	
		
			
				|  |  | +	managerDao := dao.NewManagerDao(datasource.InstanceDbMaster())
 | 
	
		
			
				|  |  | +	managerList := managerDao.GetGroupId(id)
 | 
	
		
			
				|  |  | +	if len(managerList) != 0 {
 | 
	
		
			
				|  |  | +		return errors.New("权限组下还有管理员")
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	// 删除权限组
 | 
	
		
			
				|  |  | +	data := models.CmGroup{}
 | 
	
		
			
				|  |  | +	data.Id = id
 | 
	
		
			
				|  |  | +	err := s.dao.Delete(&data)
 | 
	
		
			
				|  |  | +	if err != nil {
 | 
	
		
			
				|  |  | +		return err
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +	return nil
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  // 构造视图层models
 | 
	
		
			
				|  |  |  func makeGroupVM(projectCM *models.CmGroup) viewmodels.Group {
 | 
	
		
			
				|  |  |  	modelsVM := viewmodels.Group{}
 |