Merge remote-tracking branch 'origin/main'

feature-flyModify
陈伟 2025-07-16 10:20:03 +08:00
commit 8710762a9d
1 changed files with 9 additions and 4 deletions

View File

@ -1029,7 +1029,8 @@ namespace OpenAuth.App.ServiceApp
using (var db = base.UnitWork.CreateContext().Db.CopyNew()) using (var db = base.UnitWork.CreateContext().Db.CopyNew())
{ {
//格式化数据 //格式化数据
string _wktModel = _commonDataManager.WktDataConvert(model.Geom, "MULTIPOLYGON ZM", 4); //string _wktModel = _commonDataManager.WktDataConvert(model.Geom, "MULTIPOLYGON ZM", 4);
string _wktModel = model.Geom;
model.Geom = null; model.Geom = null;
@ -1243,9 +1244,13 @@ namespace OpenAuth.App.ServiceApp
using (var db = UnitWork.CreateContext()) using (var db = UnitWork.CreateContext())
{ {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.AppendFormat($" Select * from lasa_annotation where \"WorkSpaceId\" = '{workspaceid}'"); sql.AppendFormat($" Select * from lasa_annotation ");
var list = db.Db.SqlQueryable<LasaAnnotation>(sql.ToString()).ToList(); var list = await db.Db.SqlQueryable<LasaAnnotation>(sql.ToString()).ToListAsync();
if (type != null && list.Count > 0) if (!string.IsNullOrEmpty(workspaceid))
{
list = list.Where(r => r.WorkSpaceId == workspaceid).ToList();
}
if (type!=null && list.Count > 0)
{ {
list = list.Where(r => r.Type == type).ToList(); list = list.Where(r => r.Type == type).ToList();
} }