diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index 5d03aafa..54c6be4c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -313,7 +313,7 @@ public class ResetSearchCenterService { sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfo.getAttrInfoMap())); } Map indexstate = elasticsearchService.searchDataById("stand","stand",standId,null); - if(!indexstate.isEmpty()){ + if(indexstate!=null && !indexstate.isEmpty()){ createStandMQService.sendStandMQ(sarStandardsInfo,"update"); }else{ createStandMQService.sendStandMQ(sarStandardsInfo,"add"); @@ -336,7 +336,7 @@ public class ResetSearchCenterService { sarBussionessStand.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStand.getAttrInfoMap())); } Map indexstate = elasticsearchService.searchDataById("bussstand","bussstand",standId,null); - if(!indexstate.isEmpty()){ + if(indexstate!=null && !indexstate.isEmpty()){ createStandMQService.sendBussStandMQ(sarBussionessStand,"update"); }else{ createStandMQService.sendBussStandMQ(sarBussionessStand,"add"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java index da7bf94b..ffb088e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java @@ -1,15 +1,17 @@ -package com.adc.da.slrs.sarPosition.entity; - -import com.adc.da.slrs.sarRole.entity.TsRole; -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.util.List; - -@Data -public class TsPositionRoleVO { - @NotNull(message = "positionId不能为空") - private String positionId; - @NotNull(message = "roleIds不能为空") - private List roleIds; -} +package com.adc.da.slrs.sarPosition.entity; + +import com.adc.da.slrs.sarRole.entity.TsRole; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class TsPositionRoleVO { + @NotNull(message = "positionId不能为空") + private String positionId; + @NotNull(message = "roleIds不能为空") + private List roleIds; + + private String operator; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 9d289a10..d912d7a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -84,12 +84,14 @@ public class TsPositionServiceImpl extends ServiceImpl roles=getRole(tsPositionRoleVO.getPositionId());