公告显示修改

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -457,9 +457,9 @@
 				<if test="dbName == 'mssql'">'%'+#{content}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{content},'%')</if>
 			</if>
-			<if test="user != null and user.id != null and user.id != ''">
+			<!--<if test="user != null and user.id != null and user.id != ''">
 				AND a.notify_user = #{user.id}
-			</if>
+			</if>-->
 			<if test="userName != null and userName != ''">
 				AND u.name LIKE
 				<if test="dbName == 'oracle'">'%'||#{userName}||'%'</if>
@@ -485,7 +485,7 @@
 			and a.create_by is not null
 
 			and a.process_instance_id in( select process_instance_id from work_activity_process
-			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id})
+			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and del_flag=1)
 			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
 			group by process_instance_id)
 
@@ -520,9 +520,9 @@
 				<if test="dbName == 'mssql'">'%'+#{content}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{content},'%')</if>
 			</if>
-			<if test="user != null and user.id != null and user.id != ''">
+			<!--<if test="user != null and user.id != null and user.id != ''">
 				AND a.notify_user = #{user.id}
-			</if>
+			</if>-->
 			<if test="userName != null and userName != ''">
 				AND u.name LIKE
 				<if test="dbName == 'oracle'">'%'||#{userName}||'%'</if>
@@ -547,7 +547,7 @@
 			</if>
 			and a.create_by is not null
 			and a.process_instance_id in( select process_instance_id from work_activity_process
-			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id})
+			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and del_flag=1)
 			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
 			group by process_instance_id)
 		</where>

src/main/webapp/static/common/css/style.css

@@ -8810,12 +8810,11 @@ th .layui-table-cell{
 }
 .bord-right > .bord-contents > .slimScrollDiv > ul > li > a > .bord-record-flag,
 .bord-right > .bord-contents > ul > li > a > .bord-record-flag{
-    width: 44px;
-    display: inline-block;
-    float: left;
-    overflow: hidden;
-    white-space:nowrap;
-    text-overflow:ellipsis;
+    position: absolute;
+    width: 30px;
+    right:85px;
+    color:#999999;
+    text-align: right;
 }
 .bord-right > .bord-contents > .slimScrollDiv > ul > li > a > .bord-record-time,
 .bord-right > .bord-contents > ul > li > a > .bord-record-time{

src/main/webapp/webpage/modules/oa/oaNotifyListMyself.jsp

@@ -199,7 +199,7 @@
                 }*/}
                 ,{field:'type',align:'center', title: '公告类型', width:80}
                 ,{field:'content',align:'center', title: '公告内容', minWidth:200,templet:function(d){
-                    return "<span title='"+ d.title +"'>" + d.title + "</span>";
+                    return "<span title='"+ d.content +"'>" + d.content + "</span>";
                 }}
                 /*,{field:'status',align:'center', title: '公告状态', width:80}*/
                 ,{field:'startDate', align:'center',title: '开始时间',width:150}

src/main/webapp/webpage/modules/oa/oaNotifyListReadMyself.jsp

@@ -170,7 +170,7 @@
                 }*/}
                 ,{field:'type',align:'center', title: '公告类型', width:80}
                 ,{field:'content',align:'center', title: '公告内容', minWidth:200,templet:function(d){
-                    return "<span title='"+ d.title +"'>" + d.title + "</span>";
+                    return "<span title='"+ d.content +"'>" + d.content + "</span>";
                 }}
                 /*,{field:'status',align:'center', title: '公告状态', width:80}*/
                 ,{field:'startDate', align:'center',title: '开始时间',width:150}

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -939,9 +939,11 @@
         var xml = "";
         <c:forEach items="${page}" var="oaNotify" varStatus="index">
         <c:if test="${index.index < 8}">
-            xml ="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看公告', '${ctx}/oa/oaNotify/view?id=${oaNotify.id}&readAttr=disabled','95%','95%')\"  >";
+            xml ="<a href=\"javascript:void(0)\" onclick=\"homeOpenDialogView('查看公告', '${ctx}/oa/oaNotify/view?id=${oaNotify.id}&readAttr=disabled','95%','95%')\"  >";
 
-            elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}\">${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}</span><span class=\"bord-record-flag\"  title=\"${oaNotify.readFlagStr}\">${oaNotify.readFlagStr}</span><span class=\"bord-record\" title=\"${oaNotify.title}\">${oaNotify.title}</span>" +
+            elem.append('<li>' + xml + "<span class=\"bord-record-type\" title=\"${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}\">${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}</span>"+
+                "<span class=\"bord-record\" title=\"${oaNotify.title}\">${oaNotify.title}</span>"+
+                '<span class="bord-record-flag">'+'${oaNotify.readFlagStr}'+'</span>' +
                 '<span class="bord-record-time">' + '<fmt:formatDate value="${oaNotify.updateDate}" pattern="yyyy-MM-dd"/>' + '</span></a></li>');
         </c:if>
         </c:forEach>
@@ -1115,7 +1117,7 @@
         if(hasMsg)
             initScroll( "msg-bord" );
 
-        $(".bord-record").attr("style", "width:" + ($(".border-ul").width() - 80 - 80) + "px;");
+        $(".bord-record").attr("style", "width:" + ($(".border-ul").width() - 80 - 115) + "px;");
     }
     resizeWindow();
     $(window).resize(function(){