|
|
@ -446,10 +446,11 @@ public class UserInfoServiceImpl implements UserInfoService { |
|
|
|
List<GroupManagementEntity> entityList = groupManagementService.queryByGroupIdList(groupIdList); |
|
|
|
List<GroupManagementEntity> entityList = groupManagementService.queryByGroupIdList(groupIdList); |
|
|
|
if (entityList != null && entityList.size() > 0) { |
|
|
|
if (entityList != null && entityList.size() > 0) { |
|
|
|
//选出默认项
|
|
|
|
//选出默认项
|
|
|
|
Optional<GroupManagementEntity> groupManagementEntityOptional = entityList.stream() |
|
|
|
List<GroupManagementEntity> collect = entityList.stream() |
|
|
|
.filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())).findFirst(); |
|
|
|
.filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())).collect(Collectors.toList()); |
|
|
|
GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.orElseGet(() -> entityList.get(0)); |
|
|
|
GroupManagementEntity groupManagementEntity = null; |
|
|
|
if(StringUtils.isNotBlank(groupManagementEntity.getXhfNsrsbh())){ |
|
|
|
if(!collect.isEmpty()){ |
|
|
|
|
|
|
|
groupManagementEntity = collect.get(0); |
|
|
|
deptEntityNew = new DeptEntity(); |
|
|
|
deptEntityNew = new DeptEntity(); |
|
|
|
deptEntityNew.setDeptId(deptEntity.getDeptId()); |
|
|
|
deptEntityNew.setDeptId(deptEntity.getDeptId()); |
|
|
|
deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh()); |
|
|
|
deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh()); |
|
|
|