Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.cshtml

@@ -8,7 +8,7 @@
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入标题" />
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入关键字查询" />
                     </div>
                     <div class="lr-layout-tool-item">
                         <div id='IsRead' class="form-control"></div>

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())
                 {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1658798343" Name="Physical Data Model 1" Objects="148" Symbols="24" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1677490504" Name="Physical Data Model 1" Objects="148" Symbols="24" Target="ORACLE Version 11g" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>PHYSICAL_DATA_MODEL_1</a:Code>
 <a:CreationDate>0</a:CreationDate>
 <a:Creator/>
-<a:ModificationDate>1657685724</a:ModificationDate>
+<a:ModificationDate>1677489461</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <a:PackageOptionsText>[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&amp;&amp;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&amp;&amp;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 &lt;&lt;MaterializedViewLog&gt;&gt;]
 Create=Yes
 
+[FolderOptions\Physical Objects\Database Generation\View &lt;&lt;MaterializedView&gt;&gt;]
+Create=Yes
+Drop=Yes
+Comment=Yes
+Permission=No
+
+[FolderOptions\Physical Objects\Database Generation\View &lt;&lt;MaterializedView&gt;&gt;\ViewColumn]
+Comment=Yes
+
+[FolderOptions\Physical Objects\Database Generation\View &lt;&lt;MaterializedView&gt;&gt;\ViewIndex]
+Create=Yes
+Drop=Yes
+Comment=Yes
+
+[FolderOptions\Physical Objects\Database Generation\View &lt;&lt;MaterializedView&gt;&gt;\ViewIndex\Filter]
+Cluster=Yes
+Other=Yes
+
+[FolderOptions\Physical Objects\Database Generation\View &lt;&lt;MaterializedView&gt;&gt;\Trigger]
+Create=Yes
+Drop=Yes
+Comment=Yes
+
+[FolderOptions\Physical Objects\Database Generation\View &lt;&lt;MaterializedView&gt;&gt;\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</a:FontList>
 <a:Code>DS_Department</a:Code>
 <a:CreationDate>1657616336</a:CreationDate>
 <a:Creator>l</a:Creator>
-<a:ModificationDate>1657618885</a:ModificationDate>
+<a:ModificationDate>1677490488</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <a:TotalSavingCurrency/>
 <c:ExtendedCollections>
 <o:ExtendedCollection Id="o32">
-<a:ObjectID>FF26818E-946D-4688-9949-70A96F6678AF</a:ObjectID>
+<a:ObjectID>558ED300-C20F-42DE-B3A6-A2026F8B8090</a:ObjectID>
 <a:Name>Related Columns</a:Name>
 <a:ExtendedBaseCollection.CollectionName>Related Columns</a:ExtendedBaseCollection.CollectionName>
-<a:CreationDate>1657618888</a:CreationDate>
+<a:CreationDate>1677490504</a:CreationDate>
 <a:Creator>l</a:Creator>
-<a:ModificationDate>1657618888</a:ModificationDate>
+<a:ModificationDate>1677490504</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 </o:ExtendedCollection>
 </c:ExtendedCollections>
@@ -2057,10 +2086,10 @@ LABL 0 新宋体,8,N</a:FontList>
 <o:Column Id="o39">
 <a:ObjectID>6BB164A7-9B2A-4C8B-803B-D9FF5A1CDB4B</a:ObjectID>
 <a:Name>排序号</a:Name>
-<a:Code>Order</a:Code>
+<a:Code>IOrder</a:Code>
 <a:CreationDate>1657616446</a:CreationDate>
 <a:Creator>l</a:Creator>
-<a:ModificationDate>1657618885</a:ModificationDate>
+<a:ModificationDate>1677490488</a:ModificationDate>
 <a:Modifier>l</a:Modifier>
 <a:DataType>NUMBER</a:DataType>
 </o:Column>