x

src/main/java/com/yunzhi/marketing/xlk/controller/CurriculumController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.xlk.dto.CurriculumDTO;
 import com.yunzhi.marketing.xlk.entity.Brand;
 import com.yunzhi.marketing.xlk.entity.Video;
@@ -58,6 +59,8 @@ public class CurriculumController extends BaseController {
     @RequestMapping(value="/admin/curriculum",method= RequestMethod.GET)
     public ResponseBean curriculumList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="name",required = false) String name,
+                                       @RequestParam(value ="roleId",required = false) Integer roleId,
                                        @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -65,6 +68,8 @@ public class CurriculumController extends BaseController {
 		    IPage<Curriculum> pg = new Page<>(pageNum, pageSize);
             LambdaQueryWrapper<Curriculum> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Curriculum::getOrgId,getOrgId(request));
+            queryWrapper.eq(!StringUtils.isEmpty(name),Curriculum::getName,name);
+            queryWrapper.eq(null != roleId,Curriculum::getRoleId,roleId);
             queryWrapper.orderByDesc(Curriculum::getWeight);
             queryWrapper.orderByDesc(Curriculum::getCreatedTime);
 

src/main/java/com/yunzhi/marketing/xlk/dto/CurriculumDTO.java

@@ -64,4 +64,9 @@ public class CurriculumDTO implements java.io.Serializable {
      */
     @TableField("WEIGHT")
     private Integer weight;
+
+    /**
+     * 是否发布
+     */
+    private Integer isPublish;
 }

src/main/java/com/yunzhi/marketing/xlk/entity/Curriculum.java

@@ -106,12 +106,12 @@ public class Curriculum implements java.io.Serializable {
     /**
      * 阅读人数
      */
-    private Integer lookNum = 0;
+    private Integer lookNum;
 
     /**
      * 是否发布
      */
-    private Integer isPublish = 0;
+    private Integer isPublish;
 
 
 }