c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-08-28 14:51:47 +08:00
parent 4367d3882f
commit 48cc8a448c
12 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java
+4 -8
View File
@@ -96,14 +96,10 @@ public class ClubUserJoinApprovalController {
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.andEX("YEAR(info.applyDate)","=",pageForm.getYear());
cnd.and(Cnd.likeEX("info.userName", pageForm.getUserName()));
cnd.and(Cnd.likeEX("info.loginName", pageForm.getLoginName()));
cnd.andEX("info.unionId","=",pageForm.getUnionId());
cnd.andEX("info.unitId","=",pageForm.getUnitId());
if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
}
cnd.and(Cnd.likeEX("u.userName", pageForm.getUserName()));
cnd.and(Cnd.likeEX("u.loginName", pageForm.getLoginName()));
cnd.andEX("u.unionId","=",pageForm.getUnionId());
cnd.andEX("u.unitId","=",pageForm.getUnitId());
if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java
+4 -8
View File
@@ -102,14 +102,10 @@ public class ClubUserJoinSchoolApprovalController {
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.andEX("YEAR(info.applyDate)", "=", pageForm.getYear());
cnd.and(Cnd.likeEX("info.userName", pageForm.getUserName()));
cnd.and(Cnd.likeEX("info.loginName", pageForm.getLoginName()));
cnd.andEX("info.unionId", "=", pageForm.getUnionId());
cnd.andEX("info.unitId", "=", pageForm.getUnitId());
if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) {
cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname())));
}
cnd.and(Cnd.likeEX("u.userName", pageForm.getUserName()));
cnd.and(Cnd.likeEX("u.loginName", pageForm.getLoginName()));
cnd.andEX("u.unionId", "=", pageForm.getUnionId());
cnd.andEX("u.unitId", "=", pageForm.getUnitId());
if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinPageVo.java
+1 -1
View File
@@ -42,6 +42,6 @@ public class ClubUserJoinPageVo{
private String taskParentId;
private String taskVariable;
private String curTaskName;
private Boolean canRevoke;
private Integer canRevoke;
private String startTaskId;
}
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class CondolenceTypeController {
@ApiOperation("查询职工慰问类型")
@SaCheckLogin
public Result queryCondolenceType() {
List<CondolenceType> list = typeService.query(Cnd.NEW().desc(CondolenceType::getCode));
List<CondolenceType> list = typeService.query(Cnd.where(CondolenceType::getEnable, "=", true).desc(CondolenceType::getCode));
return Result.success(list);
}
}
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/CondolenceType.java
+3 -2
View File
@@ -48,9 +48,10 @@ public class CondolenceType extends BaseModel {
private String way;
@Column
@Comment("是否禁用")
@Comment("是否启用")
@ColDefine(type = ColType.BOOLEAN)
private Boolean isDisabled;
@Default("1")
private Boolean enable;
@Column
@Comment("是否上传附件")