--no commit message

com.zrqx.works/src/main/java/com/zrqx/works/bg/controller/apply/ApplyController.java

@@ -11,7 +11,6 @@ import java.util.List;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +26,7 @@ import com.zrqx.core.constant.works.WorksRequestPath;
 import com.zrqx.core.enums.works.apply.StatusEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.works.bg.apply.ApplyResourceForm;
+import com.zrqx.core.form.works.bg.apply.QueryApplyForm;
 import com.zrqx.core.form.works.bg.apply.SaveApplyForm;
 import com.zrqx.core.model.works.apply.Apply;
 import com.zrqx.core.model.works.apply.ApplyResource;
@@ -93,13 +93,13 @@ public class ApplyController {
 
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping(value = WorksRequestPath.PAGE)
-	public CallBack<PageInfo<QueryApplyVo>> page(String status, PageParam pageParam) {
+	public CallBack<PageInfo<QueryApplyVo>> page(QueryApplyForm form, PageParam pageParam) {
 		pageParam.setOrderBy("applyTime desc");
 		Criteria cr = service.createCriteria();
 		String userId = redis.getUser().getUserId();
 		cr.andEqualTo("userId", userId);
-		if (StringUtils.isNotBlank(status)) {
-			cr.andEqualTo("status", status);
+		if (form.getStatus() != null) {
+			cr.andEqualTo("status", form.getStatus());
 		}
 		List<Apply> list = service.selectByCriteria();
 		List<QueryApplyVo> qaVo = new ArrayList<QueryApplyVo>();