|
@@ -856,35 +856,7 @@ public class PayBaseCustomerandmeterrelaServiceImpl implements PayBaseCustomeran
|
|
|
List<PaySysDictSelectDto> cardList = paySysDictMapper.getAll(null,null,"证件类型",loginUser.getTenantId());
|
|
|
//5.查找机构类型集合
|
|
|
List<OrganizationDto> list = new ArrayList<OrganizationDto>();
|
|
|
- //先获取第一节点数据
|
|
|
- List<OrganizationDto> organizationList = organizationMapper.fingByOrganizationOne(loginUser.getSiteId(),loginUser.getCustomerId());
|
|
|
- String name = "";
|
|
|
- for(int i=0; i<organizationList.size(); i++){
|
|
|
- Integer id = organizationList.get(i).getId();
|
|
|
- List<OrganizationDto> likeList = organizationMapper.findListLikeOrgin(id,loginUser.getSiteId(),loginUser.getCustomerId());
|
|
|
- for(int j=0; j<likeList.size(); j++){
|
|
|
- String collections = likeList.get(j).getCollections();
|
|
|
- String[] coll = collections.split(",");
|
|
|
- String orgNames = "";
|
|
|
- for(int k=0; k<coll.length; k++){
|
|
|
- if(StringUtils.isNotBlank(coll[k])){
|
|
|
- String orgId = coll[k];
|
|
|
- String orgName = organizationMapper.findOrginName(orgId,loginUser.getSiteId(),loginUser.getCustomerId());
|
|
|
- orgNames += orgName +"/";
|
|
|
- }
|
|
|
- }
|
|
|
- orgNames = orgNames.substring(0,orgNames.length()-1);
|
|
|
- name = orgNames+"/"+likeList.get(j).getName();
|
|
|
- if(StringUtils.isNotBlank(name)){
|
|
|
- OrganizationDto dto = new OrganizationDto();
|
|
|
- dto.setName(name);
|
|
|
- list.add(dto);
|
|
|
- name = "";
|
|
|
- }
|
|
|
- orgNames = "";
|
|
|
- }
|
|
|
- }
|
|
|
- organizationList.addAll(list);
|
|
|
+
|
|
|
//6.查找住房类型集合
|
|
|
List<PaySysDictSelectDto> houseList = paySysDictMapper.getAll(null,null,"住房类型",loginUser.getTenantId());
|
|
|
//7.查找开户分组集合
|
|
@@ -900,7 +872,7 @@ public class PayBaseCustomerandmeterrelaServiceImpl implements PayBaseCustomeran
|
|
|
context.putVar("propertyList", propertyList);
|
|
|
context.putVar("settlementList", settlementList);
|
|
|
context.putVar("cardList", cardList);
|
|
|
- context.putVar("organizationList", organizationList);
|
|
|
+ // context.putVar("organizationList", organizationList);
|
|
|
context.putVar("houseList", houseList);
|
|
|
context.putVar("customerList", customerList);
|
|
|
context.putVar("controList",controList);
|