合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!77

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) {
+		//用户在法规清单角色切换中，切换角色，只有这个项目的studio 有id，其他用户第一次默认是没有的。如果不是studio  只能给他新增一条数据 ，后续回显使用。
+		if(StringUtils.isNotEmpty(projectLibraryRoleRelEO.getId())){
 			Date now = new Date();
 			projectLibraryRoleRelEO.setUpdateTime(now);
-    	saveOrUpdate(projectLibraryRoleRelEO);
+			this.baseMapper.updateById(projectLibraryRoleRelEO);
+		}else {
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			projectLibraryRoleRelEO.setUserId(currentUser.getId());
+			this.baseMapper.insert(projectLibraryRoleRelEO);
+		}
     }
 
 	/**

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java

@@ -132,6 +132,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					new QueryWrapper<ProjectTaskInventoryDetailEO>().lambda().eq(ProjectTaskInventoryDetailEO::getId, projectTaskInventoryFeedbackEO.getProjectTaskInventoryId())
 			);
 
+			if(!Objects.isNull(projectTaskInventoryDetailEO)){
 				ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
 						new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId())
 				);
@@ -221,6 +222,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 			}
 		}
+    }
 
 	/**
 	 * 通过id删除

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) => {