用户列表

cif-service/src/main/java/com/txz/cif/web/mng/UserController.java

@@ -67,13 +67,20 @@ public class UserController extends AbstractApiController {
         Condition condition = new Condition(User.class);
         Example.Criteria criteria = condition.createCriteria();
         Example.Criteria criteria2 = condition.or();
+        if (param.getType() == null){
+            param.setType(0);
+        }
         if (param.getType() == 1){
             criteria.andEqualTo("pid",userId);
             criteria2.andEqualTo("pid",userId);
-        } else {
+        } else if (param.getType() == 2){
             criteria.andEqualTo("ppid",userId);
             criteria2.andEqualTo("ppid",userId);
         }
+        if (param.getStatus() != null){
+            criteria.andEqualTo("status",param.getStatus());
+            criteria2.andEqualTo("status",param.getStatus());
+        }
         if (StrUtil.isNotBlank(param.getName())) {
             criteria.andLike("name", "%" + param.getName() + "%");
             criteria2.andLike("name", "%" + param.getName() + "%");

cif-service/src/main/java/com/txz/cif/web/para/MyUserParam.java

@@ -17,6 +17,9 @@ public class MyUserParam {
     @ApiModelProperty("类型：0本级 1下级 2下下级")
     private Integer type;
 
+    @ApiModelProperty("状态  1正常 2禁止提现 3禁止登录 4禁止下单")
+    private Integer status;
+
     /**
      * 开始时间
      */