'commit'

Logs/dsSupport.log

@@ -61,3 +61,19 @@
 [Error]2020/09/01 14:25:45 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
 [Error]2020/09/01 14:45:55 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
 [Error]2020/09/01 14:45:55 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:20:34 SqlUpdateError 	 接入系统authToken Update，数据库操作发生严重错误：Params type error
+[Error]2020/09/01 15:24:43 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:24:43 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:27:48 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:27:48 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:28:22 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:28:22 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:30:22 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:30:22 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:39:09 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:39:09 SqlQueryError 	 Error 1054: Unknown column 'id' in 'field list'
+[Error]2020/09/01 15:41:46 SqlUpdateError 	 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value
+[Error]2020/09/01 15:42:29 SqlUpdateError 	 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value
+[Error]2020/09/01 15:42:42 SqlUpdateError 	 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value
+[Error]2020/09/01 15:44:09 SqlUpdateError 	 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value
+[Error]2020/09/01 15:45:10 SqlUpdateError 	 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value

dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go

@@ -40,7 +40,7 @@ func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32,
 	joinList, _, _ = CacheUtil.Page(sql, 10000, 1)
 	joinListJson, _ = json.Marshal(joinList)
 
-	mergedList = CommonUtil.ListMerge(mergedList, string(joinListJson), " consume_systemid", "app_id", "consume_systemname", "app_name")
+	mergedList = CommonUtil.ListMerge(mergedList, string(joinListJson), "consume_systemid", "app_id", "consume_systemname", "app_name")
 	fmt.Println(mergedList)
 
 	var datas []map[string]interface{}

dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go

@@ -21,6 +21,9 @@ func GetJyt2012Results(swag MySwagger.Jyt2012Swag) (bool, string, int32, []map[s
 	if swag.DicName != "" {
 		conditions = append(conditions, "dic_name="+"'"+html.EscapeString(swag.DicName)+"'")
 	}
+	if swag.DicValue != "" {
+		conditions = append(conditions, "dic_value="+"'"+html.EscapeString(swag.DicValue)+"'")
+	}
 	if swag.DicType != 0 {
 		conditions = append(conditions, "dic_type="+"'"+strconv.Itoa(swag.DicType)+"'")
 	}
@@ -65,6 +68,7 @@ func CreateJyt2012(model models.TDataexJyt2012) (bool, string, error) {
 	business := new(models.TDataexJyt2012)
 	business.Id = CommonUtil.GetUUID()
 	business.DicName = html.EscapeString(model.DicName)
+	business.DicValue = html.EscapeString(model.DicValue)
 	business.DicType = model.DicType
 	business.DicInfo = html.EscapeString(model.DicInfo)
 	business.RootFlag = model.RootFlag

dsSupport/MyModel/MySwagger/Jyt2012Swag.go

@@ -14,6 +14,7 @@ import "time"
 type Jyt2012Swag struct {
 	Id         string    `json:"id" xorm:"not null pk comment('ID') VARCHAR(36)"`
 	DicName    string    `json:"dic_name" xorm:"not null comment('字典/字典项名称') VARCHAR(100)"`
+	DicValue    string    `json:"dic_name" xorm:"not null comment('字典/字典项值') VARCHAR(100)"`
 	DicType    int       `json:"dic_type" xorm:"not null default 1 comment('字典类型【1：国标数据、关联数据源，2：国标字典、关联元数据】') INT(11)"`
 	DicInfo    string    `json:"dic_info" xorm:"default ''NULL'' comment('字典相信说明') VARCHAR(500)"`
 	RootFlag   int       `json:"root_flag" xorm:"not null default -1 comment('是否是字典【1：是，-1：否】') INT(11)"`

dsSupport/models/t_dataex_jyt2012.go

@@ -7,6 +7,7 @@ import (
 type TDataexJyt2012 struct {
 	Id         string    `json:"id" xorm:"not null pk comment('ID') VARCHAR(36)"`
 	DicName    string    `json:"dic_name" xorm:"not null comment('字典/字典项名称') VARCHAR(100)"`
+	DicValue   string    `json:"dic_value" xorm:"not null comment('字典/字典项值') VARCHAR(100)"`
 	DicType    int       `json:"dic_type" xorm:"not null default 1 comment('字典类型【1：国标数据、关联数据源，2：国标字典、关联元数据】') INT(11)"`
 	DicInfo    string    `json:"dic_info" xorm:"default ''NULL'' comment('字典相信说明') VARCHAR(500)"`
 	RootFlag   int       `json:"root_flag" xorm:"not null default -1 comment('是否是字典【1：是，-1：否】') INT(11)"`