策略方式修改

controllers/user.go

@@ -50,6 +50,7 @@ func (this *UserController) ChooseDetail() {
 		br.ErrMsg = "GetCompanyPermissionId,Err:" + err.Error()
 		return
 	}
+	permissionId = "23"
 	if permissionId == "" {
 		br.Ret = 200
 		br.Success = true
@@ -99,7 +100,11 @@ func (this *UserController) ChooseDetail() {
 		return
 	}
 	for k, v := range permissionList {
-		permissionList[k].List = mapIndustrial[v.ChartPermissionId]
+		if len(mapIndustrial[v.ChartPermissionId]) == 0 {
+			permissionList[k].List = make([]*models.IndustrialManagementRep, 0)
+		} else {
+			permissionList[k].List = mapIndustrial[v.ChartPermissionId]
+		}
 		if len(ampCheckList[v.ChartPermissionId]) == 0 {
 			permissionList[k].CheckList = make([]int, 0)
 		} else {
@@ -164,9 +169,15 @@ func (this *UserController) ChooseSubmit() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	industrialManagementIds := req.IndustrialManagementIds
+	var industrialManagementIds string
+	industrialManagementList := req.List
+	for _, v := range industrialManagementList {
+		if v.ChartPermissionId != 23 {
+			industrialManagementIds += v.IndustrialManagementIds + ","
+		}
+	}
+	industrialManagementIds = strings.TrimRight(industrialManagementIds, ",")
 	sliceIndustrial := strings.Split(industrialManagementIds, ",")
-
 	var itemsFllow []*models.CygxIndustryFllow
 	for _, v := range sliceIndustrial {
 		item := new(models.CygxIndustryFllow)

models/xzs_choose_send.go

@@ -28,10 +28,15 @@ type CygxXzsChooseSendResp struct {
 }
 
 type SubmitChooseSendResp struct {
-	IsRefuse                int    `description:"是否拒绝推送，0否、1是  如果为1 则不做任何推送"`
-	IsSubjective            int    `description:"是否选择主观推送， 1 是 、 0否"`
-	IsObjective             int    `description:"是否选择客观推送， 1 是 、 0否"`
-	IndustrialManagementIds string `description:"产业ID,多个用， 隔开"`
+	IsRefuse     int `description:"是否拒绝推送，0否、1是  如果为1 则不做任何推送"`
+	IsSubjective int `description:"是否选择主观推送， 1 是 、 0否"`
+	IsObjective  int `description:"是否选择客观推送， 1 是 、 0否"`
+	List         []*IndustrialManagementIdResp
+}
+
+type IndustrialManagementIdResp struct {
+	IndustrialManagementIds string `description:"产业ID 多个用 ，隔开"`
+	ChartPermissionId       int    `description:"权限id"`
 }
 
 //添加