瀏覽代碼

fix:钢联化工指标,如果名称为空的话,呢么限制指标编码

Roc 1 年之前
父節點
當前提交
cd928ce03c

+ 5 - 0
controllers/data_manage/mysteel_chemical_data.go

@@ -66,6 +66,11 @@ func (this *EdbInfoController) MysteelChemicalClassify() {
 		button.AddButton = false //不管有没有权限,指标都是没有添加按钮的
 		v.Button = button
 
+		// 指标编码为空的话,就显示编码
+		if v.ClassifyName == `` {
+			v.ClassifyName = v.IndexCode
+		}
+
 		baseFromMysteelChemicalIndexMap[v.BaseFromMysteelChemicalClassifyId] = append(baseFromMysteelChemicalIndexMap[v.BaseFromMysteelChemicalClassifyId], v)
 	}
 

+ 1 - 0
models/data_manage/mysteel_chemical_classify.go

@@ -61,6 +61,7 @@ type BaseFromMysteelChemicalClassifyItems struct {
 	Level                             int                                        `description:"层级"`
 	Sort                              int                                        `description:"排序字段,越小越靠前,默认值:10"`
 	UniqueCode                        string                                     `description:"唯一编码"`
+	IndexCode                         string                                     `description:"指标编码" json:"-"`
 	ModifyTime                        time.Time                                  `description:"修改时间"`
 	CreateTime                        time.Time                                  `description:"创建时间"`
 	Button                            BaseFromMysteelChemicalClassifyItemsButton `description:"操作权限"`

+ 1 - 1
models/data_manage/mysteel_chemical_index.go

@@ -70,7 +70,7 @@ type MysteelChemicalFrequency struct {
 // GetMysteelChemicalIndexAll 用于分类展示
 func GetMysteelChemicalIndexAll() (items []*BaseFromMysteelChemicalClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,
+	sql := ` SELECT base_from_mysteel_chemical_index_id,base_from_mysteel_chemical_classify_id,index_name AS classify_name,index_code,
              sys_user_id,sys_user_real_name,sort
             FROM base_from_mysteel_chemical_index ORDER BY sort asc, create_time ASC `
 	_, err = o.Raw(sql).QueryRows(&items)