name

cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -354,7 +354,7 @@ public class UserApiController extends AbstractApiController {
         PageHelper.startPage(param.getPage(), param.getSize());
         Condition condition = new Condition(User.class);
         Example.Criteria criteria = condition.createCriteria();
-        if (param.getType() == 1){
+        if (param.getType() != null && param.getType() == 1){
             criteria.andEqualTo("pid",userId);
         } else {
             criteria.andEqualTo("ppid",userId);

cif-service/src/main/java/com/txz/cif/web/bo/UserBo2.java

@@ -24,6 +24,9 @@ public class UserBo2 {
     @ApiModelProperty("名称")
     private String nickname;
 
+    @ApiModelProperty("名称")
+    private String name;
+
     @ApiModelProperty("头像")
     private String headPic;