区域,公司id 改INT
This commit is contained in:
parent
0cc6bebe99
commit
2eba102e28
|
|
@ -13,7 +13,7 @@ public class BaseAreaEditDTO {
|
||||||
private Integer id=0;
|
private Integer id=0;
|
||||||
|
|
||||||
|
|
||||||
private Long parentAreaRowId=0L;
|
private Integer parentAreaRowId=0;
|
||||||
|
|
||||||
@NotBlank(message = "区域名称不能为空")
|
@NotBlank(message = "区域名称不能为空")
|
||||||
private String areaName;
|
private String areaName;
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ public class AdminBaseAreaService {
|
||||||
|
|
||||||
private List<TBaseAreaVO> getAllParents(TBaseAreaVO node, Map<Integer, TBaseAreaVO> idToNodeMap) {
|
private List<TBaseAreaVO> getAllParents(TBaseAreaVO node, Map<Integer, TBaseAreaVO> idToNodeMap) {
|
||||||
List<TBaseAreaVO> parents = new ArrayList<>();
|
List<TBaseAreaVO> parents = new ArrayList<>();
|
||||||
Long parentId = node.getParentAreaRowId();
|
Integer parentId = node.getParentAreaRowId();
|
||||||
while (parentId != null && parentId>0) {
|
while (parentId != null && parentId>0) {
|
||||||
TBaseAreaVO parentNode = idToNodeMap.get(parentId);
|
TBaseAreaVO parentNode = idToNodeMap.get(parentId);
|
||||||
if (parentNode == null) break; // 防止数据不一致导致无限循环
|
if (parentNode == null) break; // 防止数据不一致导致无限循环
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ public class TBaseAreaVO implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 父级行ID
|
* 父级行ID
|
||||||
*/
|
*/
|
||||||
private Long parentAreaRowId;
|
private Integer parentAreaRowId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 预期名称
|
* 预期名称
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ public class TBaseArea implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 父级行ID
|
* 父级行ID
|
||||||
*/
|
*/
|
||||||
private Long parentAreaRowId;
|
private Integer parentAreaRowId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 区域名称
|
* 区域名称
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue