From 618f76fd41527d4fec0eefd1d492a8c52da79032 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期三, 30 十一月 2022 17:09:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Service/IStation.Service.Basic/property/general_property/GeneralProperty.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Service/IStation.Service.Basic/property/general_property/GeneralProperty.cs b/Service/IStation.Service.Basic/property/general_property/GeneralProperty.cs
index 20fc44b..1afa777 100644
--- a/Service/IStation.Service.Basic/property/general_property/GeneralProperty.cs
+++ b/Service/IStation.Service.Basic/property/general_property/GeneralProperty.cs
@@ -238,12 +238,21 @@
}
/// <summary>
- /// 鏍规嵁 PropertyName 鍒ゆ柇鏄惁瀛樺湪
+ /// 鍒ゆ柇 PropertyName 鏄惁瀛樺湪
/// </summary>
public bool IsExistPropertyName(string ObjectType, string PropertyName)
{
var all = GetByObjectType(ObjectType);
- return all.Exists(x => x.ObjectType == ObjectType && x.PropertyName == PropertyName);
+ return all.Exists(x => x.PropertyName == PropertyName);
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇 PropertyName 鏄惁瀛樺湪 鎺掑簭鐗瑰畾ID
+ /// </summary>
+ public bool IsExistPropertyNameExceptID(string ObjectType, string PropertyName, long ExceptID)
+ {
+ var all = GetByObjectType(ObjectType);
+ return all.Exists(x => x.PropertyName == PropertyName&&x.ID!= ExceptID);
}
#endregion
--
Gitblit v1.9.3