From 3c8cb14e32f58824df7488579f315a815a415bdd Mon Sep 17 00:00:00 2001
From: zhangyanduan <zhangyanduan@91isoft.com>
Date: Fri, 18 Mar 2022 15:37:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=8E=A5=E5=8F=A3BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/search/server/ResetSearchCenterService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<String, Object> 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<String, Object> indexstate = elasticsearchService.searchDataById("bussstand","bussstand",standId,null);
-                if(!indexstate.isEmpty()){
+                if(indexstate!=null && !indexstate.isEmpty()){
                     createStandMQService.sendBussStandMQ(sarBussionessStand,"update");
                 }else{
                     createStandMQService.sendBussStandMQ(sarBussionessStand,"add");

From 4c40e4dbb101cf1777d3593b5170c483999609d3 Mon Sep 17 00:00:00 2001
From: 11528 <1152856986@qq.com>
Date: Wed, 23 Mar 2022 15:48:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BA=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarPosition/entity/TsPositionRoleVO.java  | 32 ++++++++++---------
 .../service/impl/TsPositionServiceImpl.java   |  2 ++
 2 files changed, 19 insertions(+), 15 deletions(-)

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<String> 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<String> 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<TsPositionDao, TsPosition
             tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id);
             updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
             tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
+            tsPosition.setOperator(tsPositionRoleVO.getOperator());
             baseMapper.update(tsPosition,updateWrapper);
         }
         for(String id:deleteIds){
             tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id);
             updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
             tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
+            tsPosition.setOperator(tsPositionRoleVO.getOperator());
             baseMapper.update(tsPosition,updateWrapper);
         }
         List<TsRole> roles=getRole(tsPositionRoleVO.getPositionId());