Compare commits

...

2 Commits

Author SHA1 Message Date
ljw f78746f7d2 Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud
# Conflicts:
#	njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizProjectService.java
2025-09-20 16:39:12 +08:00
ljw 7189995990 项目管理 2025-09-20 16:36:20 +08:00
1 changed files with 8 additions and 1 deletions

View File

@ -63,10 +63,16 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
* *
*/ */
public PageResult<SearchBizProjectResult> paging(PageParam pageParam, BizProjectEntity bizProjectEntity) { public PageResult<SearchBizProjectResult> paging(PageParam pageParam, BizProjectEntity bizProjectEntity) {
AuditStatus auditStatus = bizProjectEntity.getAuditStatus();
String aStatus = "";
if (null != auditStatus) {
aStatus = auditStatus.getVal();
}
UserDetail userDetail = SecurityUtil.loginUser(); UserDetail userDetail = SecurityUtil.loginUser();
BizObj bizObj = Dict.parse(userDetail.getBizObj(), BizObj.values()); BizObj bizObj = Dict.parse(userDetail.getBizObj(), BizObj.values());
QueryWrapper<BizProjectEntity> ew = Wrappers.<BizProjectEntity>query() QueryWrapper<BizProjectEntity> ew = Wrappers.<BizProjectEntity>query()
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName()); .like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName())
.eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus);
if (bizObj != null && bizObj.isTrans()) { if (bizObj != null && bizObj.isTrans()) {
ew.eq("a.user_id", userDetail.getUserId()); ew.eq("a.user_id", userDetail.getUserId());
@ -75,6 +81,7 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
} }
return PageResult.of(baseMapper.paging(pageParam.toPage(), ew)); return PageResult.of(baseMapper.paging(pageParam.toPage(), ew));
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)