diff --git "a/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs" "b/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs"
index 7f4fff6..4f39795 100644
--- "a/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs"
+++ "b/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs"
@@ -202,7 +202,7 @@ public partial class Job : EntityBase<Job>
if (id > 0) exp &= _.ID == id;
if (appid > 0) exp &= _.AppID == appid;
if (mode > 0) exp &= _.Mode == mode;
- if (!key.IsNullOrEmpty()) exp &= _.Name.Contains(key);
+ if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
exp &= _.CreateTime.Between(start, end);
return FindAll(exp, p);
diff --git "a/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.Biz.cs" "b/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.Biz.cs"
index 904d7be..f064018 100644
--- "a/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.Biz.cs"
+++ "b/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.Biz.cs"
@@ -164,7 +164,7 @@ public partial class JobTask : EntityBase<JobTask>
if (jobid >= 0) exp &= _.JobID == jobid;
if (status >= JobStatus.就绪) exp &= _.Status == status;
if (!client.IsNullOrEmpty()) exp &= _.Client == client;
- if (!key.IsNullOrEmpty()) exp &= _.Data.Contains(key) | _.Remark.Contains(key) | _.Key == key;
+ if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
exp &= _.DataTime.Between(dataStart, dataEnd);
exp &= _.UpdateTime.Between(start, end);
diff --git "a/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.Biz.cs" "b/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.Biz.cs"
index b7cd3c3..0fca806 100644
--- "a/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.Biz.cs"
+++ "b/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.Biz.cs"
@@ -116,7 +116,7 @@ public partial class JobError : EntityBase<JobError>
if (appid > 0) exp &= _.AppID == appid;
if (jobid > 0) exp &= _.JobID == jobid;
if (!client.IsNullOrEmpty()) exp &= _.Client == client;
- if (!key.IsNullOrEmpty()) exp &= _.Remark.Contains(key);
+ if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
exp &= _.DataTime.Between(start, end);
return FindAll(exp, p);
diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.Biz.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.Biz.cs"
index 15d343d..5d5ab57 100644
--- "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.Biz.cs"
+++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.Biz.cs"
@@ -93,10 +93,7 @@ public partial class AppHistory : EntityBase<AppHistory>
exp &= _.Id.Between(start, end, Meta.Factory.Snow);
//exp &= _.CreateTime.Between(start, end);
- if (!key.IsNullOrEmpty())
- {
- exp &= (_.Name.Contains(key) | _.Remark.Contains(key) | _.CreateIP.Contains(key));
- }
+ if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
return FindAll(exp, page);
}
diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.Biz.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.Biz.cs"
index 9afd2c3..03d28f9 100644
--- "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.Biz.cs"
+++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.Biz.cs"
@@ -100,7 +100,7 @@ public partial class AppOnline : EntityBase<AppOnline>
var exp = new WhereExpression();
if (appid > 0) exp &= _.AppID == appid.ToInt();
- if (!key.IsNullOrEmpty()) exp &= _.Name.Contains(key) | _.Instance.Contains(key);
+ if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
exp &= _.CreateTime.Between(start, end);
return FindAll(exp, p);
diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.Biz.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.Biz.cs"
index 0d8ee7f..6cb5d79 100644
--- "a/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.Biz.cs"
+++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.Biz.cs"
@@ -101,7 +101,7 @@ public partial class AppMessage : EntityBase<AppMessage>
if (appid > 0) exp &= _.AppID == appid;
if (jobid > 0) exp &= _.JobID == jobid;
- if (!key.IsNullOrEmpty()) exp &= _.Topic.Contains(key) | _.Data.Contains(key);
+ if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
exp &= _.Id.Between(start, end, Meta.Factory.Snow);
//exp &= _.UpdateTime.Between(start, end);
diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.Biz.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.Biz.cs"
index d84bc6d..5acc46f 100644
--- "a/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.Biz.cs"
+++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.Biz.cs"
@@ -87,7 +87,7 @@ public partial class App : EntityBase<App>
if (enable != null) exp &= _.Enable == enable;
if (!category.IsNullOrEmpty()) exp &= _.Category == category;
- if (!key.IsNullOrEmpty()) exp &= _.Name.Contains(key) | _.DisplayName.Contains(key);
+ if (!key.IsNullOrEmpty()) exp &= SearchWhereByKeys(key);
return FindAll(exp, p);
}