From d3de93096098ac53e33c1d56b91acbe24902da38 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 12 Jul 2022 09:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=87=E6=8D=A2=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryRoleRelEOServiceImpl.java | 16 +++++++++++++---
 .../components/listOfRegulations.vue             |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java
index 638d7a3d0..43ff8ba30 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java
@@ -1,10 +1,13 @@
 package com.jero.modules.project.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
 import com.jero.modules.project.mapper.ProjectLibraryRoleRelEOMapper;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import me.zhyd.oauth.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Date;
@@ -43,9 +46,16 @@ public class ProjectLibraryRoleRelEOServiceImpl extends ServiceImpl<ProjectLibra
 	 */
 	@Override
     public void editById(ProjectLibraryRoleRelEO projectLibraryRoleRelEO) {
-    	Date now = new Date();
-        projectLibraryRoleRelEO.setUpdateTime(now);
-    	saveOrUpdate(projectLibraryRoleRelEO);
+		//用户在法规清单角色切换中，切换角色，只有这个项目的studio 有id，其他用户第一次默认是没有的。如果不是studio  只能给他新增一条数据 ，后续回显使用。
+		if(StringUtils.isNotEmpty(projectLibraryRoleRelEO.getId())){
+			Date now = new Date();
+			projectLibraryRoleRelEO.setUpdateTime(now);
+			this.baseMapper.updateById(projectLibraryRoleRelEO);
+		}else {
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			projectLibraryRoleRelEO.setUserId(currentUser.getId());
+			this.baseMapper.insert(projectLibraryRoleRelEO);
+		}
     }
 
 	/**
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index fa31b4536..d23200165 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1219,7 +1219,8 @@
           if (valid) {
             let query = {
               roleCode: this.formInlineRoleSwitching.roleSwitchingCode,
-              id: this.AndUserId
+              id: this.AndUserId,
+              projectLibraryId: this.$route.query.id
             }
             this.confirmLoadingRoleSwitching = true
             postAction(this.url.AndUserIdEdit, query).then((res) => {