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

Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

Browse Source
This commit is contained in:
zyx.net
2023-09-26 14:55:22 +08:00
parent 7ceffc9c95 02fde85171
commit b40409ed18
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+18 -18
View File
@@ -399,8 +399,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectLawsInventoryEOTemp.setCreateTime(new Date());
projectLawsInventoryEOTemp.setUpdateTime(new Date());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
@@ -425,8 +425,8 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectLawsInventoryEOTemp.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectLawsInventoryEOTemp.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectLawsInventoryEOTemp.setCreateTime(new Date());
projectLawsInventoryEOTemp.setUpdateTime(new Date());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
@@ -682,13 +682,13 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
public void deleteById(String id, String projectLibraryId, String cut) {
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("该用户没有删除权限");
} else {
throw new JeroBootException("The user has no deletion permission");
}
}
// if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
// if (CutEnum.CN.getValue().equals(cut)) {
// throw new JeroBootException("该用户没有删除权限");
// } else {
// throw new JeroBootException("The user has no deletion permission");
// }
// }
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -734,13 +734,13 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
}
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int isProjectRole = this.checkUserRole(projectLibraryId, currentUser.getId(), "");
if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("该用户没有删除权限");
} else {
throw new JeroBootException("The user has no deletion permission");
}
}
// if (!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))) {
// if (CutEnum.CN.getValue().equals(cut)) {
// throw new JeroBootException("该用户没有删除权限");
// } else {
// throw new JeroBootException("The user has no deletion permission");
// }
// }
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();