Merge branch 'master-chw' into dev-chw

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserCollectBiz.java

@@ -134,10 +134,13 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
         return  selectByExample(example);
     }
     //我的收藏
-    public ObjectRestResponse getCollectList(Integer userId,int page,int limit){
+    public ObjectRestResponse getCollectList(Integer userId,Integer type,int page,int limit){
         Example example = new Example(AppUserCollect.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("userId",userId).andEqualTo("isDel",0).andEqualTo("status",0);
+        if (type != null && type > 0){
+            criteria.andEqualTo("type",type);
+        }
         example.setOrderByClause("`id` desc");
         List<AppUserCollect> list=selectByExample(example);
         PageHelper.startPage(page,limit);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserCollectController.java

@@ -45,7 +45,8 @@ public class AppUserCollectController extends CommonBaseController {
     @ApiModelProperty("我的收藏")
     public ObjectRestResponse list(
             @RequestParam(value = "page",defaultValue = "1")Integer page,
-            @RequestParam(value = "limit",defaultValue = "10")Integer limit
+            @RequestParam(value = "limit",defaultValue = "10")Integer limit,
+            @RequestParam(value = "type",defaultValue = "0")Integer type
     ) {
         try {
             String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
@@ -53,7 +54,7 @@ public class AppUserCollectController extends CommonBaseController {
                 throw new Exception();
             }
             Integer userid=Integer.parseInt(username);
-            return collectBiz.getCollectList(userid,page,limit);
+            return collectBiz.getCollectList(userid,type,page,limit);
         }catch (Exception e) {
             log.error(e.getMessage());
             return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");