Merge branch 'master' of liubing/guns-separation into master

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlArticleContentController.java

@@ -54,7 +54,7 @@ public class ZjxlArticleContentController extends BaseController {
                                         @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                         @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,pageNo-1,pageSize*pageNo);
            List<ZjxlArticleContent> articleContentList = articleContentService.findArticleContentById(id,articleContentTitle,systemDictType,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
@@ -222,7 +222,7 @@ public class ZjxlArticleContentController extends BaseController {
                               @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                               @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlArticleContent> articleContentList = articleContentService.findNewsList(id,articleContentClassify,articleContentSubclassify,3,pageNo-1,pageSize*pageNo);
            List<ZjxlArticleContent> articleContentList = articleContentService.findNewsList(id,articleContentClassify,articleContentSubclassify,3,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(articleContentList,pageNo,pageSize,articleContentService.allNewsCount(articleContentClassify,articleContentSubclassify)));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlBannerCnotroller.java

@@ -70,7 +70,7 @@ public class ZjxlBannerCnotroller extends BaseController {
                                 @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                 @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlBanner> banner = bannerService.findById(id,name,pageNo-1,pageSize*pageNo);
            List<ZjxlBanner> banner = bannerService.findById(id,name,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data",PageUtil.getPage(banner,pageNo,pageSize,bannerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();
@@ -280,7 +280,7 @@ public class ZjxlBannerCnotroller extends BaseController {
                                 @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                 @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "1") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            return write(200,"查询成功","data",bannerService.findBannerByIsOnLine(pageNo-1,pageSize*pageNo));
            return write(200,"查询成功","data",bannerService.findBannerByIsOnLine((pageNo-1)*pageNo,pageSize*pageNo));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlCompanyCaseController.java

@@ -52,7 +52,7 @@ public class ZjxlCompanyCaseController extends BaseController {
                                      @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                      @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlCompanyCase> companyCaseList = companyCaseService.findById(id,name,lineStatus,pageNo-1,pageSize*pageNo);
            List<ZjxlCompanyCase> companyCaseList = companyCaseService.findById(id,name,lineStatus,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(companyCaseList,pageNo,pageSize,companyCaseService.allCount(id,name,lineStatus)));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlNewsCenterController.java

@@ -41,7 +41,7 @@ public class ZjxlNewsCenterController extends BaseController {
                                      @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                      @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlNewsCenter> newsCenterList = newsCenterService.findById(id,pageNo-1,pageSize*pageNo);
            List<ZjxlNewsCenter> newsCenterList = newsCenterService.findById(id,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(newsCenterList,pageNo,pageSize,newsCenterService.allCount()));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlPartnerController.java

@@ -44,7 +44,7 @@ public class ZjxlPartnerController extends BaseController {
            @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
            @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlPartner> partnerList = partnerService.findPartenrById(id,name,pageNo-1,pageSize*pageNo);
            List<ZjxlPartner> partnerList = partnerService.findPartenrById(id,name,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功", "data", PageUtil.getPage(partnerList,pageNo,pageSize,partnerService.allCount()));
        }catch (Exception e){
            e.printStackTrace();

guns-main/src/main/java/cn/stylefeng/guns/zjxl/cnotroller/ZjxlSystemDictController.java

@@ -44,7 +44,7 @@ public class ZjxlSystemDictController extends BaseController {
                                                 @ApiParam(name = "pageNo", value = "第几页", defaultValue = "1") @RequestParam(value = "pageNo", required = false) Integer pageNo,
                                                 @ApiParam(name = "pageSize", value = "分页大小", defaultValue = "10") @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<ZjxlSystemDict> systemDictList = systemDictService.findSystemDictById(id,systemDictType,pageNo-1,pageSize*pageNo);
            List<ZjxlSystemDict> systemDictList = systemDictService.findSystemDictById(id,systemDictType,(pageNo-1)*pageSize,pageSize*pageNo);
            return write(200,"查询成功","data", PageUtil.getPage(systemDictList,pageNo,pageSize,systemDictService.allCount(systemDictType+"")));
        }catch (Exception e){
            e.printStackTrace();