Browse Source

FIX:修复设备管理启用筛选不生效问题

zoie 1 year ago
parent
commit
24e1dc9243
2 changed files with 5 additions and 2 deletions
  1. 1 1
      initialize/db.go
  2. 4 1
      models/Device/DeviceSensor.go

+ 1 - 1
initialize/db.go

@@ -62,7 +62,7 @@ func init() {
 	)
 
 	DB, Err = gorm.Open(mysql.Open(dataSource), &gorm.Config{
-		DisableForeignKeyConstraintWhenMigrating: true,
+		DisableForeignKeyConstraintWhenMigrating: true, // 禁用外键
 		Logger:                                   newLogger,
 		DisableAutomaticPing:                     true,
 	})

+ 4 - 1
models/Device/DeviceSensor.go

@@ -1010,7 +1010,10 @@ func Read_DeviceSensorManageList(admin_r *Account.Admin, bindSN []string, T_pid
 	}
 
 	// -------------
-	sql := "SELECT COUNT(ds.ID) FROM " + "device_sensor ds WHERE " + sql_WHERE
+	sql := "SELECT COUNT(ds.ID) FROM " + "device_sensor ds " +
+		"LEFT JOIN device_sensor_parameter dsp " +
+		"ON ds.t_sp=dsp.id " +
+		"WHERE " + sql_WHERE + sql_ORDER
 	fmt.Println(sql)
 	_, err := o.Raw(sql).ValuesList(&maps_z)
 	if err != nil {