fuxingfan 3 years ago
parent
commit
5af9cb1101

+ 5
- 0
src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java View File

6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
 import com.yunzhi.marketing.base.BaseController;
7
 import com.yunzhi.marketing.base.BaseController;
8
 import com.yunzhi.marketing.base.ResponseBean;
8
 import com.yunzhi.marketing.base.ResponseBean;
9
+import com.yunzhi.marketing.common.StringUtils;
9
 import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
10
 import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
10
 import com.yunzhi.marketing.xlk.entity.Brand;
11
 import com.yunzhi.marketing.xlk.entity.Brand;
11
 import com.yunzhi.marketing.xlk.entity.Video;
12
 import com.yunzhi.marketing.xlk.entity.Video;
58
     @RequestMapping(value="/admin/curriculum",method= RequestMethod.GET)
59
     @RequestMapping(value="/admin/curriculum",method= RequestMethod.GET)
59
     public ResponseBean curriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
60
     public ResponseBean curriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
60
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
61
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
62
+                                       @RequestParam(value ="name",required = false) String name,
63
+                                       @RequestParam(value ="roleId",required = false) Integer roleId,
61
                                        @RequestHeader("authorization") String token, HttpServletRequest request){
64
                                        @RequestHeader("authorization") String token, HttpServletRequest request){
62
         ResponseBean responseBean = new ResponseBean();
65
         ResponseBean responseBean = new ResponseBean();
63
         try {
66
         try {
65
 		    IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
68
 		    IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
66
             LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
69
             LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
67
             queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
70
             queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
71
+            queryWrapper.eq(!StringUtils.isEmpty(name),Curriculum::getName,name);
72
+            queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
68
             queryWrapper.orderByDesc(Curriculum::getWeight);
73
             queryWrapper.orderByDesc(Curriculum::getWeight);
69
             queryWrapper.orderByDesc(Curriculum::getCreatedTime);
74
             queryWrapper.orderByDesc(Curriculum::getCreatedTime);
70
 
75
 

+ 5
- 0
src/main/java/com/yunzhi/marketing/xlk/dto/CurriculumDTO.java View File

64
      */
64
      */
65
     @TableField("WEIGHT")
65
     @TableField("WEIGHT")
66
     private Integer weight;
66
     private Integer weight;
67
+
68
+    /**
69
+     * 是否发布
70
+     */
71
+    private Integer isPublish;
67
 }
72
 }

+ 2
- 2
src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java View File

106
     /**
106
     /**
107
      * 阅读人数
107
      * 阅读人数
108
      */
108
      */
109
-    private Integer lookNum = 0;
109
+    private Integer lookNum;
110
 
110
 
111
     /**
111
     /**
112
      * 是否发布
112
      * 是否发布
113
      */
113
      */
114
-    private Integer isPublish = 0;
114
+    private Integer isPublish;
115
 
115
 
116
 
116
 
117
 }
117
 }