WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改切換角色

Browse Source
This commit is contained in:
qq787203167
2022-06-06 09:44:12 +08:00
parent e60be41f12
commit f6e2b5dbf6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+4 -1
View File
@@ -614,7 +614,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
//验证当前用户在该项目中是什么角色 //验证当前用户在该项目中是什么角色
int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), ""); //int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), "");
//if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){ if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())){
projectLawsInventoryEOQueryWrapper.and(queryWrapper ->{ projectLawsInventoryEOQueryWrapper.and(queryWrapper ->{
queryWrapper.eq("regulation_owner_id",currentUser.getId()). queryWrapper.eq("regulation_owner_id",currentUser.getId()).
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+2 -1
View File
@@ -281,7 +281,7 @@
for (let j = 0; j < timeDataList.length; j++) { for (let j = 0; j < timeDataList.length; j++) {
let time = JSON.stringify(timeDataList[j].time).slice(1, 11) let time = JSON.stringify(timeDataList[j].time).slice(1, 11)
if (time == list[i]) { if (time == list[i]) {
data.push([i, timeDataList[j].index, 14, j]) data.push([i, timeDataList[j].index, 12, j])
} }
} }
} }
@@ -368,6 +368,7 @@
series: [ series: [
{ {
type: 'scatter', type: 'scatter',
color:['#21c9cc'],
symbolSize: function(val) { symbolSize: function(val) {
return val[2] * 2 return val[2] * 2
}, },