Commit 6d6063cd authored by wujipeng's avatar wujipeng
Browse files

优化

parent df6466ba
...@@ -210,6 +210,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -210,6 +210,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
excelDataEntity.setPayeeName(userDTO.getUserName()); excelDataEntity.setPayeeName(userDTO.getUserName());
} }
excelDataEntity.setCaseId(userDTO.getCaseId()); excelDataEntity.setCaseId(userDTO.getCaseId());
excelDataEntity.setUseFlag(true);
//添加节点数据 //添加节点数据
excelDataService.save(excelDataEntity); excelDataService.save(excelDataEntity);
userDTO.setType("1"); userDTO.setType("1");
...@@ -250,13 +251,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -250,13 +251,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
everyoneVO.setRelation(userRelation); everyoneVO.setRelation(userRelation);
} }
//查询账户 //查询账户
List<String> oneselfAccountList = userAccountService.queryUserAccountList(oneself.getUserName()); List<String> oneselfAccountList = userAccountService.queryUserAccountList(userDTO.getUserName());
List<String> otherAccountList = userAccountService.queryUserAccountList(oneself.getUserName()); List<String> otherAccountList = userAccountService.queryUserAccountList(userDTO.getOtherName());
PageHelper.startPage(userDTO.getPageNum(), userDTO.getPageSize()); PageHelper.startPage(userDTO.getPageNum(), userDTO.getPageSize());
if(!ObjectUtils.isEmpty(oneselfAccountList) && !ObjectUtils.isEmpty(otherAccountList)){
List<ExcelDataEntity> details = excelDataService.relationPage(oneselfAccountList, otherAccountList); List<ExcelDataEntity> details = excelDataService.relationPage(oneselfAccountList, otherAccountList);
everyoneVO.setDetails(details); everyoneVO.setDetails(details);
}
PageHelper.clearPage(); PageHelper.clearPage();
return everyoneVO; return everyoneVO;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment