jz.kai пре 5 година
родитељ
комит
d82849aeaf

+ 1 - 0
common/src/main/java/com/jpsoft/smart/modules/base/dao/MessageNoticeDAO.java

@@ -15,4 +15,5 @@ public interface MessageNoticeDAO {
 	int delete(String id);
 	List<MessageNotice> list();
 	List<MessageNotice> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<MessageNotice> searchShort(Map<String,Object> searchParams,List<Sort> sortList);
 }

+ 1 - 0
common/src/main/java/com/jpsoft/smart/modules/base/service/MessageNoticeService.java

@@ -14,4 +14,5 @@ public interface MessageNoticeService {
 	int delete(String id);
 	List<MessageNotice> list();
 	Page<MessageNotice> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+	Page<MessageNotice> pageSearchShort(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 }

+ 9 - 0
common/src/main/java/com/jpsoft/smart/modules/base/service/impl/MessageNoticeServiceImpl.java

@@ -67,4 +67,13 @@ public class MessageNoticeServiceImpl implements MessageNoticeService {
         
         return page;
 	}
+
+	@Override
+	public Page<MessageNotice> pageSearchShort(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+		Page<MessageNotice> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+			messageNoticeDAO.searchShort(searchParams,sortList);
+		});
+
+		return page;
+	}
 }

+ 14 - 0
common/src/main/resources/mapper/base/MessageNotice.xml

@@ -104,4 +104,18 @@ id_,title_,content_,sender_id,recipient_id,status_,del_flag,create_by,create_tim
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="searchShort" parameterType="hashmap" resultMap="MessageNoticeMap">
+		<![CDATA[
+			select id_,title_ from base_message_notice
+		]]>
+		<where>
+			and del_flag = false
+			<if test="searchParams.title != null">
+				and title_ like #{searchParams.title}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

+ 1 - 4
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/MessageNoticeApiController.java

@@ -104,10 +104,7 @@ public class MessageNoticeApiController {
             searchParams.put("title","%" + title + "%");
         }
 
-        Page<MessageNotice> page = messageNoticeService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
-        for(MessageNotice messageNotice : page.getResult()){
-            messageNotice.setContent(null);
-        }
+        Page<MessageNotice> page = messageNoticeService.pageSearchShort(searchParams,pageIndex,pageSize,true,sortList);
 
         msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));