diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index ba21bd92d..e07b4c2d9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -18,7 +18,7 @@ public enum ProjectRoleEnum { INTERFACE_PERSON1("工程接口人","30","Interface person"), PERSON_LIABLE1("责任人","31","Person liable"), // 项目库-认证清单使用。 - INTERFACE_PERSON("接口人","20","Interface person"), + INTERFACE_PERSON("工程接口人","20","Interface person"), PERSON_LIABLE("责任人","21","Person liable"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java index 2d2227610..593bd08c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java @@ -105,6 +105,7 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl { private String sort; //置顶标识(flag为空的时候为置顶, flag为1的时候取消置顶) + // flag为1时置顶 空时不置顶。 private String flag; @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 82e68a6cc..17b938696 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -374,8 +374,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { boolean flag = false; - if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){ - flag = true; + if(projectCertificationInventoryEO.getEndTime() != null && certificationInventory.getEndTime() != null){ + if(!projectCertificationInventoryEO.getEndTime().equals(certificationInventory.getEndTime())){ + flag = true; + } } return flag; }).collect(Collectors.toList()); @@ -412,6 +414,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl querySdtCountWrap = new QueryWrapper<>(); querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getSdt,loginUser.getId()); + querySdtCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); Integer sdtCount = this.baseMapper.selectCount(querySdtCountWrap); if(sdtCount > 0){ SysRole sysRole = new SysRole(); @@ -944,6 +949,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl queryDutyPersonCountWrap = new QueryWrapper<>(); queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,loginUser.getId()); + queryDutyPersonCountWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId,projectLibraryId); Integer dutyPersonCount = this.baseMapper.selectCount(queryDutyPersonCountWrap); if(dutyPersonCount > 0){ SysRole sysRole = new SysRole();