fix bug

controllers/data_manage/cross_variety/variety.go

@@ -49,7 +49,7 @@ func (c *VarietyController) Add() {
 		br.ErrMsg = "添加失败，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.ChartVarietyId > 0 {
 		br.Msg = "添加失败，品种名称不能重复"
 		br.IsSendEmail = false
 		return

controllers/data_manage/supply_analysis/variety.go

@@ -151,7 +151,7 @@ func (this *VarietyController) Add() {
 		br.ErrMsg = "添加失败，Err:" + err.Error()
 		return
 	}
-	if item != nil {
+	if item != nil && item.VarietyId > 0 {
 		br.Msg = "添加失败，品种名称不能重复"
 		br.IsSendEmail = false
 		return

models/data_manage/supply_analysis/variety_plant.go

@@ -89,7 +89,7 @@ type VarietyPlantItem struct {
 	SysUserRealName               string             `description:"添加人真实姓名"`
 	ModifyTime                    string             `description:"最近一次更新时间"`
 	CreateTime                    string             `description:"添加时间"`
-	Button                        VarietyPlantButton `description:"操作按钮权限"`
+	Button                        VarietyPlantButton `gorm:"-" description:"操作按钮权限"`
 }
 
 type VarietyPlantButton struct {

models/report_approve/report_approve.go

@@ -171,7 +171,7 @@ func (m *ReportApprove) GetCountByCondition(condition string, pars []interface{}
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -187,7 +187,7 @@ func (m *ReportApprove) GetItemsByCondition(condition string, pars []interface{}
 	}
 	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
 	//_, err = o.Raw(sql, pars).QueryRows(&items)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Find(&items).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/semantic_analysis/sa_doc.go

@@ -427,14 +427,14 @@ type ElasticSaDoc struct {
 func GetSaDocsWithUseNumByCondition(condition string, pars []interface{}) (items []*SaDocItem, err error) {
 	// o := orm.NewOrm()
 	sql := `SELECT
-				a.*, COUNT(b.sa_compare_label_id) AS use_num
+				a.sa_doc_id,a.classify_id,a.classify_name,a.title,a.theme,a.cover_img,a.content_md5,a.sys_admin_id,a.sys_admin_name,a.sort,a.create_time,a.modify_time, COUNT(b.sa_compare_label_id) AS use_num
 			FROM
 				sa_doc AS a
 			LEFT JOIN sa_compare_label AS b ON a.sa_doc_id = b.doc_id
 			WHERE
 				1 = 1 %s
 			GROUP BY
-				a.sa_doc_id
+				a.sa_doc_id,a.classify_id,a.classify_name,a.title,a.theme,a.cover_img,a.content_md5,a.sys_admin_id,a.sys_admin_name,a.sort,a.create_time,a.modify_time
 			ORDER BY
 			    a.sort ASC, a.create_time DESC, a.sa_doc_id ASC`
 	sql = fmt.Sprintf(sql, condition)