Browse Source

pid

feature/teamB_zz_wgh
yinzuomei 3 years ago
parent
commit
41f3eff2cd
  1. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
  2. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  3. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java

@ -23,7 +23,7 @@ public class OptionResultDTO implements Serializable {
private List<OptionResultDTO> children; private List<OptionResultDTO> children;
private Boolean usableFlag; private Boolean usableFlag;
private String type; private String type;
private String pid;
/** /**
* desc:递归获取当前节点的 所有子节点 * desc:递归获取当前节点的 所有子节点

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -922,6 +922,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
OptionResultDTO dto = new OptionResultDTO(); OptionResultDTO dto = new OptionResultDTO();
dto.setLabel(item.getGridName()); dto.setLabel(item.getGridName());
dto.setValue(item.getId()); dto.setValue(item.getId());
dto.setPid(item.getPid());
return dto; return dto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }

3
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -733,7 +733,8 @@
case when ca.ORGANIZATION_NAME is null or ca.ORGANIZATION_NAME='' then cg.GRID_NAME case when ca.ORGANIZATION_NAME is null or ca.ORGANIZATION_NAME='' then cg.GRID_NAME
else concat(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME) else concat(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME)
end end
)as label )as label,
cg.PID
from customer_grid cg from customer_grid cg
left join customer_agency ca left join customer_agency ca
on(cg.PID=ca.id and ca.DEL_FLAG='0') on(cg.PID=ca.id and ca.DEL_FLAG='0')

Loading…
Cancel
Save