修改代码

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/custom/CustomQueryDTO.java

+package com.upyuns.platform.rs.website.dto.custom;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+@Data
+public class CustomQueryDTO extends PageParam {
+    private Integer type;
+    private Integer status;
+}
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/CustomFormController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.upyuns.platform.rs.website.biz.CustomFormBiz;
+import com.upyuns.platform.rs.website.dto.custom.CustomQueryDTO;
 import com.upyuns.platform.rs.website.entity.CustomForm;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,9 +18,15 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FA
 public class CustomFormController extends BaseController<CustomFormBiz,CustomForm> {
 
     @RequestMapping(value = "list",method = RequestMethod.GET)
-    public ObjectRestResponse<PageDataVO<CustomForm>> myCustoms(PageParam dto) {
+    public ObjectRestResponse<PageDataVO<CustomForm>> list(CustomQueryDTO dto) {
         return ObjectRestResponse.succ(PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.selectByWeekend(w -> {
             w.andEqualTo(CustomForm::getIsDel, SYS_FALSE);
+            if(null != dto.getType()) {
+                w.andEqualTo(CustomForm::getType, dto.getType());
+            }
+            if(null != dto.getStatus()) {
+                w.andEqualTo(CustomForm::getStatus, dto.getStatus());
+            }
             return w;
         }, " 'status' asc, crt_time desc")));
     }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/CustomFormWebController.java

@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.upyuns.platform.rs.datacenter.fegin.DatacenterFeign;
 import com.upyuns.platform.rs.website.biz.CustomFormBiz;
+import com.upyuns.platform.rs.website.dto.custom.CustomQueryDTO;
 import com.upyuns.platform.rs.website.entity.CustomForm;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
@@ -91,7 +92,7 @@ public class CustomFormWebController extends BaseController<CustomFormBiz,Custom
     }
 
     @RequestMapping(value = "myCustoms",method = RequestMethod.GET)
-    public ObjectRestResponse<PageDataVO<CustomForm>> myCustoms(DTO dto) {
+    public ObjectRestResponse<PageDataVO<CustomForm>> myCustoms(CustomQueryDTO dto) {
         return ObjectRestResponse.succ(PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.selectByWeekend(w -> {
             w.andEqualTo(CustomForm::getUserId, getAppUser().getUserid());
             w.andEqualTo(CustomForm::getIsDel, SYS_FALSE);
@@ -115,9 +116,4 @@ public class CustomFormWebController extends BaseController<CustomFormBiz,Custom
         return ObjectRestResponse.succ();
     }
 
-    @Data
-    public static class DTO extends PageParam {
-        private Integer type;
-    }
-
 }
\ No newline at end of file