| | |
|---|
| | | List<BtmTypeAttributeVO> voListAdd = btmTypeAttributeService.checkAndInsert(oid, addList, AuthUtil.getUserAccount(), new Date()); |
|---|
| | | List<BtmTypeAttributeVO> voListUpdate = btmTypeAttributeService.checkAndUpdate(oid, modifyList, AuthUtil.getUserAccount(), new Date()); |
|---|
| | | List<BtmTypeAttributeVO> returnList = new ArrayList<>(); |
|---|
| | | returnList.addAll(Objects.requireNonNull(voListAdd)); |
|---|
| | | returnList.addAll(Objects.requireNonNull(voListUpdate)); |
|---|
| | | if (!CollectionUtils.isEmpty(voListAdd)) { |
|---|
| | | returnList.addAll(voListAdd); |
|---|
| | | } |
|---|
| | | if (!CollectionUtils.isEmpty(voListUpdate)) { |
|---|
| | | returnList.addAll(voListUpdate); |
|---|
| | | } |
|---|
| | | return returnList; |
|---|
| | | } |
|---|
| | | |
|---|
