fuxingfan 3 jaren geleden
bovenliggende
commit
5af9cb1101

+ 5
- 0
src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java Bestand weergeven

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7
 import com.yunzhi.marketing.base.BaseController;
8 8
 import com.yunzhi.marketing.base.ResponseBean;
9
+import com.yunzhi.marketing.common.StringUtils;
9 10
 import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
10 11
 import com.yunzhi.marketing.xlk.entity.Brand;
11 12
 import com.yunzhi.marketing.xlk.entity.Video;
@@ -58,6 +59,8 @@ public class CurriculumController extends BaseController {
58 59
     @RequestMapping(value="/admin/curriculum",method= RequestMethod.GET)
59 60
     public ResponseBean curriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
60 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 64
                                        @RequestHeader("authorization") String token, HttpServletRequest request){
62 65
         ResponseBean responseBean = new ResponseBean();
63 66
         try {
@@ -65,6 +68,8 @@ public class CurriculumController extends BaseController {
65 68
 		    IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
66 69
             LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
67 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 73
             queryWrapper.orderByDesc(Curriculum::getWeight);
69 74
             queryWrapper.orderByDesc(Curriculum::getCreatedTime);
70 75
 

+ 5
- 0
src/main/java/com/yunzhi/marketing/xlk/dto/CurriculumDTO.java Bestand weergeven

@@ -64,4 +64,9 @@ public class CurriculumDTO implements java.io.Serializable {
64 64
      */
65 65
     @TableField("WEIGHT")
66 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 Bestand weergeven

@@ -106,12 +106,12 @@ public class Curriculum implements java.io.Serializable {
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
 }