Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<option name="USE_SOCKET_TRANSPORT" value="true" />
|
||||
<option name="SERVER_MODE" value="false" />
|
||||
<option name="SHMEM_ADDRESS" />
|
||||
<option name="HOST" value="192.168.1.13" />
|
||||
<option name="HOST" value="172.16.10.51" />
|
||||
<option name="PORT" value="8001" />
|
||||
<option name="AUTO_RESTART" value="false" />
|
||||
<RunnerSettings RunnerId="Debug">
|
||||
|
||||
@@ -126,6 +126,8 @@ public class ExchangeImportDataManagerService {
|
||||
for (EquatableEntityInterface item : itemsToDelete) {
|
||||
Object child = parentField.get(item);
|
||||
|
||||
if(child == null) continue;
|
||||
|
||||
if (child instanceof List) {
|
||||
List<EntityBase> childList = (List<EntityBase>) child;
|
||||
childList
|
||||
|
||||
Reference in New Issue
Block a user