..

controllers/chart_classify.go

@@ -963,7 +963,7 @@ func (this *ChartClassifyController) ModifyChartClassify() {
 		chartClassifyIds := req.ChartClassifyIds
 		sysUserIds := req.SysUserIds
 		chartName := req.ChartName
-
+		chartInfoIds := req.ChartInfoIds
 		condition := " AND source = ? "
 		pars := make([]interface{}, 0)
 		pars = append(pars, utils.CHART_SOURCE_DEFAULT)
@@ -983,10 +983,28 @@ func (this *ChartClassifyController) ModifyChartClassify() {
 				}
 				classifyIdSlice = append(classifyIdSlice, tmp)
 			}
-			condition += "  AND chart_classify_id not in (" + utils.GetOrmInReplace(len(classifyIdSlice)) + ") "
+			condition += "  AND chart_classify_id in (" + utils.GetOrmInReplace(len(classifyIdSlice)) + ") "
 			pars = append(pars, classifyIdSlice)
 		}
 
+		if chartInfoIds != "" {
+			chartIdStr := strings.Split(chartInfoIds, ",")
+			if len(chartIdStr) == 0 {
+				br.Msg = "请选择正确的图表"
+			}
+			notChartIds := make([]int, 0)
+			for _, id := range chartIdStr {
+				tmp, e := strconv.Atoi(id)
+				if e != nil {
+					br.Msg = "请选择正确的图表"
+					return
+				}
+				notChartIds = append(notChartIds, tmp)
+			}
+			condition += "  AND chart_info_id not in (" + utils.GetOrmInReplace(len(notChartIds)) + ") "
+			pars = append(pars, notChartIds)
+		}
+
 		if sysUserIds != "" {
 			adminIds := strings.Split(sysUserIds, ",")
 			if len(adminIds) == 0 {

controllers/eta_business/user.go

@@ -143,7 +143,7 @@ func (this *EtaBusinessUserController) List() {
 	condition1 := " AND business_code IN (" + utils.GetOrmInReplace(len(businessCodeStr)) + ") "
 	var pars1 []interface{}
 	pars1 = append(pars1, businessCodeStr)
-	businessList, err := obj.GetItemsByCondition(condition1, pars1, []string{"business_code", "business_name"}, "")
+	businessList, err := obj.GetItemsByCondition(condition1, pars1, []string{}, "")
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取商户信息失败，Err:" + err.Error()