update

app/admin/svc/svc_data_statisstics.go

@@ -355,7 +355,7 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta
 
 		//查询出所有的设备
 		var deviceList []*model.Device
-		err := db.Db.Where("enterprise_id != 0").Asc("id").Find(&deviceList)
+		err := db.Db.Where("enterprise_id != 0").OrderBy("CONVERT(name USING gbk) ASC").Find(&deviceList)
 		if err != nil {
 			logx.Error(err)
 			println("<<<<SelfSupportForSchoolDataStatisticsExport2>>>>>1111Error:::", err.Error())
@@ -581,7 +581,7 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta
 		//查询出所有的设备
 		var deviceList []*model.Device
 		if req.EnterpriseId == 0 {
-			err := db.Db.Where("enterprise_id != 0").Asc("id").Find(&deviceList)
+			err := db.Db.Where("enterprise_id != 0").OrderBy("CONVERT(name USING gbk) ASC").Find(&deviceList)
 			if err != nil {
 				logx.Error(err)
 				println("<<<<SelfSupportForSchoolDataStatisticsExport4>>>>>1111Error:::", err.Error())