Merge remote-tracking branch 'origin/master'

mybusiness/src/main/java/com/business/slfh/app/notice/controller/AppNoticeController.java

@@ -3,6 +3,7 @@ package com.business.slfh.app.notice.controller;
 import com.business.slfh.app.appbase.controller.AppBaseController;
 import com.business.slfh.app.appbase.domain.AppDataModel;
 import com.business.slfh.app.appbase.domain.AppPageModel;
+import com.business.slfh.app.notice.domain.AppNoticeVO;
 import com.business.slfh.app.notice.service.AppNoticeService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +22,9 @@ public class AppNoticeController extends AppBaseController {
 
     @RequestMapping("getNotice")
     @ResponseBody
-    public AppDataModel getNotice(@RequestBody AppPageModel appPageModel) {
+    public AppDataModel getNotice(@RequestBody AppNoticeVO appNoticeVO) {
 
-        AppDataModel appDataModel = appNoticeService.getNotice(appPageModel);
+        AppDataModel appDataModel = appNoticeService.getNotice(appNoticeVO);
         List list = (List) appDataModel.data.get("noticelist");
         //List r = app_startPage(appPageModel, list);
         appDataModel.data.put("noticelist", list);

mybusiness/src/main/java/com/business/slfh/app/notice/domain/AppNoticeVO.java

@@ -0,0 +1,11 @@
+package com.business.slfh.app.notice.domain;
+
+import com.business.slfh.app.appbase.domain.AppPageModel;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AppNoticeVO extends AppPageModel {
+    Long userId;
+}

mybusiness/src/main/java/com/business/slfh/app/notice/service/AppNoticeService.java

@@ -1,10 +1,11 @@
 package com.business.slfh.app.notice.service;
 
 import com.business.slfh.app.appbase.domain.AppDataModel;
-import com.business.slfh.app.appbase.domain.AppPageModel;
+import com.business.slfh.app.notice.domain.AppNoticeVO;
+
 
 public interface AppNoticeService {
 
-    public AppDataModel getNotice(AppPageModel appPageModel);
+    public AppDataModel getNotice(AppNoticeVO appNoticeVO);
 
 }

mybusiness/src/main/java/com/business/slfh/app/notice/service/impl/AppNoticeServiceImpl.java

@@ -1,12 +1,11 @@
 package com.business.slfh.app.notice.service.impl;
 
 import com.business.slfh.app.appbase.domain.AppDataModel;
-import com.business.slfh.app.appbase.domain.AppPageModel;
 import com.business.slfh.app.appbase.service.AppBaseService;
+import com.business.slfh.app.notice.domain.AppNoticeVO;
 import com.business.slfh.app.notice.service.AppNoticeService;
 import com.sooka.system.domain.SysNotice;
 import com.sooka.system.mapper.SysNoticeMapper;
-import com.sooka.system.service.ISysNoticeService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -20,16 +19,18 @@ public class AppNoticeServiceImpl extends AppBaseService implements AppNoticeSer
     SysNoticeMapper sysNoticeMapper;
 
     @Override
-    public AppDataModel getNotice(AppPageModel appPageModel) {
+    public AppDataModel getNotice(AppNoticeVO appNoticeVO) {
         AppDataModel appDataModel = getAppDataModel();
         try{
-            List ls = sysNoticeMapper.selectNoticeList(new SysNotice());
+            SysNotice sysNotice = new SysNotice();
+            sysNotice.setUserId(appNoticeVO.getUserId());
+            List ls = sysNoticeMapper.selectNoticeList(sysNotice);
 
             //分页
-            int pagenum = appPageModel.getPageNum();
-            int pageSize = appPageModel.getPageSize();
-            appPageModel.setPageNum(null);
-            appPageModel.setPageSize(null);
+            int pagenum = appNoticeVO.getPageNum();
+            int pageSize = appNoticeVO.getPageSize();
+            appNoticeVO.setPageNum(null);
+            appNoticeVO.setPageSize(null);
             List all_list = sysNoticeMapper.selectNoticeList(new SysNotice());
             int maxpage = 0;
             if (all_list.size() % pageSize == 0) {