add status terminal user filter search

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/TerminalUserSearchDTO.java

@@ -1,5 +1,6 @@
 package cn.rankin.data.api.user.dto;
 
+import cn.rankin.common.utils.enums.BaseStatusEnum;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,6 +14,8 @@ public class TerminalUserSearchDTO implements Serializable {
 
     private String merchantId;
 
+    private BaseStatusEnum status;
+
     private String sort;
 
     private Integer by;

rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalUserController.java

@@ -2,6 +2,7 @@ package cn.rankin.userservice.controller;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.data.api.user.dto.TerminalUserDTO;
 import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
 import cn.rankin.common.utils.enums.BaseOrderEnum;
@@ -19,6 +20,7 @@ import cn.rankin.userservice.utils.StudentNumberUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.EnumUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -65,6 +67,11 @@ public class TerminalUserController {
             terminalUser.setMerchantId(merchantId);
         }
 
+        BaseStatusEnum status = terminalUserSearchDTO.getStatus();
+        if (status != null) {
+            terminalUser.setStatus(status);
+        }
+
         LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
         sort.put("gmtModified", BaseOrderEnum.DESC);