config列表

operating-service/src/main/java/com/txz/operating/controller/ConfigController.java

@@ -111,8 +111,6 @@ public class ConfigController {
 
         Condition condition = new Condition(config.getClass());
         Example.Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("isDelete", 0);
-        condition.setOrderByClause("create_time DESC");
         PageInfo pageInfo = null;
         try {
             List<Config> list = configService.findByCondition(condition);

operating-service/src/main/java/com/txz/operating/service/impl/DivisionsServiceImpl.java

@@ -54,7 +54,7 @@ public class DivisionsServiceImpl extends AbstractService<Divisions> implements
                     AreaTreeVo vo = new AreaTreeVo();
                     BeanUtil.copyProperties(divisions, vo);
                     vo.setLevel(1);
-                    vo.setPid(0);
+                    vo.setPid(null);
                     return vo;
                 })
                 .collect(Collectors.toList());

operating-service/src/main/java/com/txz/operating/web/vo/AreaTreeVo.java

@@ -1,15 +1,21 @@
 package com.txz.operating.web.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AreaTreeVo {
 
+    @ApiModelProperty("id")
     private Integer id;
 
+    @ApiModelProperty("父级id")
     private Integer pid;
 
     @ApiModelProperty("内容")