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] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86=E6=93=8D?=
 =?UTF-8?q?=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());