diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.cshtml index 92f2d2137..a7c31cb78 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.cshtml @@ -8,7 +8,7 @@
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs index be706c3fb..caa5fbbd4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs @@ -396,9 +396,10 @@ SELECT ruserid from [dbo].[LR_OA_NewsShouldRead] where newsid='{news.F_NewsId}' var deptId = userinfo.departmentId; var postIds = userinfo.postIds; var strSql = new StringBuilder(); - strSql.Append("SELECT t.*,r.RNewsId,r.RTime FROM LR_OA_News t "); + strSql.Append("SELECT t.*,r.RNewsId,r.RTime,d.F_FullName FROM LR_OA_News t "); strSql.Append(" left join LR_OA_NewsRead r on t.F_NewsId = r.NewsId and r.RUserId=@userId "); strSql.Append(" left join lr_base_user u on u.F_UserId=@userId "); + strSql.Append(" left join LR_BASE_DEPARTMENT d on d.F_DepartmentId = t.F_SendDeptId "); strSql.Append(" WHERE t.F_TypeId = 2 and t.F_DeleteMark=0 and t.F_EnabledMark=1 "); if (userinfo.account.Contains("20")) { @@ -440,7 +441,10 @@ SELECT ruserid from [dbo].[LR_OA_NewsShouldRead] where newsid='{news.F_NewsId}' var dp = new DynamicParameters(new { }); if (!queryParam["keyword"].IsEmpty()) { - strSql.Append($" AND t.F_FullHead Like '{queryParam["keyword"].ToString()}' "); + + var keyword = "%" + queryParam["keyword"].ToString() + "%"; + strSql.Append(@" AND ( t.F_FullHead like '" + keyword + "' or t.F_Category like '" + keyword + "' or t.F_CreateUserName like '" + keyword + + "' or t.F_SourceName like'"+ keyword + "' or t.F_SourceAddress like '"+ keyword + "' "); } if (!queryParam["categoryId"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM index 4967301c7..db7f25663 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ PHYSICAL_DATA_MODEL_1 0 -1657685724 +1677489461 l [FolderOptions] @@ -101,7 +101,7 @@ GenSyncRmg=0 [FolderOptions\Physical Objects\Database Generation\Format] GenScriptTitle=Yes GenScriptNamLabl=No -GenScriptQDtbs=Yes +GenScriptQDtbs=No GenScriptQOwnr=Yes GenScriptCase=0 GenScriptEncoding=ANSI @@ -208,7 +208,7 @@ Footer=Yes Constraint declaration=No [FolderOptions\Physical Objects\Database Generation\Table&&Column\Column] -User datatype=Yes +User datatype=No Default value=Yes Check=Yes Physical Options=Yes @@ -255,9 +255,9 @@ Constraint declaration=Yes Physical Options=Yes [FolderOptions\Physical Objects\Database Generation\Table&&Column\Index\Filter] -Primary key=Yes +Primary key=No Foreign key=Yes -Alternate key=Yes +Alternate key=No Cluster=Yes Other=Yes @@ -385,6 +385,35 @@ Drop=Yes [FolderOptions\Physical Objects\Database Generation\ExtendedObject <<MaterializedViewLog>>] Create=Yes +[FolderOptions\Physical Objects\Database Generation\View <<MaterializedView>>] +Create=Yes +Drop=Yes +Comment=Yes +Permission=No + +[FolderOptions\Physical Objects\Database Generation\View <<MaterializedView>>\ViewColumn] +Comment=Yes + +[FolderOptions\Physical Objects\Database Generation\View <<MaterializedView>>\ViewIndex] +Create=Yes +Drop=Yes +Comment=Yes + +[FolderOptions\Physical Objects\Database Generation\View <<MaterializedView>>\ViewIndex\Filter] +Cluster=Yes +Other=Yes + +[FolderOptions\Physical Objects\Database Generation\View <<MaterializedView>>\Trigger] +Create=Yes +Drop=Yes +Comment=Yes + +[FolderOptions\Physical Objects\Database Generation\View <<MaterializedView>>\Trigger\Filter] +For insert=Yes +For update=Yes +For delete=Yes +For other=Yes + [FolderOptions\Physical Objects\Test Data] GenDataPathName= GenDataSinglefile=Yes @@ -1972,17 +2001,17 @@ LABL 0 新宋体,8,N DS_Department 1657616336 l -1657618885 +1677490488 l -FF26818E-946D-4688-9949-70A96F6678AF +558ED300-C20F-42DE-B3A6-A2026F8B8090 Related Columns Related Columns -1657618888 +1677490504 l -1657618888 +1677490504 l @@ -2057,10 +2086,10 @@ LABL 0 新宋体,8,N 6BB164A7-9B2A-4C8B-803B-D9FF5A1CDB4B 排序号 -Order +IOrder 1657616446 l -1657618885 +1677490488 l NUMBER