英文品种禁用

controllers/english_report/en_permission.go

@@ -278,7 +278,7 @@ func (this *EnPermissionController) List() {
 		limitIds = ps
 	}
 
-	cond := ``
+	cond := ` AND enabled=1 `
 	pars := make([]interface{}, 0)
 	if keyword != "" {
 		k := fmt.Sprint("%", keyword, "%")

models/classify.go

@@ -38,6 +38,7 @@ type Classify struct {
 	RelateTel         int       `description:"是否在电话会中可选: 0-否; 1-是"`
 	RelateVideo       int       `description:"是否在路演视频中可选: 0-否; 1-是"`
 	IsMassSend        int       `description:"1:群发,0:非群发"`
+	Enabled           int       `description:"是否可用，1可用，0禁用"`
 }
 
 func GetClassifyById(classifyId int) (item *Classify, err error) {

services/contract/contract.go

@@ -1230,13 +1230,9 @@ func GetServicePermissionMap(serviceList []*contract.ContractServiceAndDetail) (
 				return
 			}
 			permissionMap := make(map[int][]*company.PermissionLookItem, 0)
-			permissionCheckMap := make(map[int][]int, 0)
 			for _, v := range allFiccPermissions {
 				if v.ParentId > 0 {
 					permissionMap[v.ParentId] = append(permissionMap[v.ParentId], v)
-					if v.IsPublic == 1 {
-						permissionCheckMap[v.ParentId] = append(permissionCheckMap[v.ParentId], v.ChartPermissionId)
-					}
 				}
 			}
 			for _, v := range allFiccPermissions {