lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
zt
2025-12-02 17:42:35 +08:00
parent e972efb247
commit c96808efc1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java
View File

@ -271,7 +271,7 @@ public class SubConstructionUserController extends BaseController {
/** /**
* 查询项目班组列表 contractor:constructionUser:newUserList * 查询项目班组列表 contractor:constructionUser:newUserList
*/ */
@SaCheckPermission(value = {"project:projectTeam:addTeam", "contractor:constructionUser:newUserList"}, mode = SaMode.OR) @SaCheckPermission(value = {"project:projectTeam:addTeam", "contractor:constructionUser:newUserList","contractor:constructionUser:addTeam"}, mode = SaMode.OR)
@GetMapping("/projectList") @GetMapping("/projectList")
public TableDataInfo<BusProjectVo> list(BusProjectQueryReq req, PageQuery pageQuery) { public TableDataInfo<BusProjectVo> list(BusProjectQueryReq req, PageQuery pageQuery) {
return projectService.queryPageList(req, pageQuery); return projectService.queryPageList(req, pageQuery);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java
View File

@ -393,7 +393,7 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
if (list != null && !list.isEmpty()) { if (list != null && !list.isEmpty()) {
long count = 0; long count = 0;
for (DesVolumeFile file : list) { for (DesVolumeFile file : list) {
if (BusinessStatusEnum.DRAFT.getStatus().equals(file.getAuditStatus())) { if (BusinessStatusEnum.DRAFT.getStatus().equals(file.getAuditStatus()) && !DesVolumeFile.WASTE.equals(file.getType())) {
count++; count++;
} }
} }