diff --git a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java index eb962a9..e6c006a 100644 --- a/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java +++ b/dms-dormitory/src/main/java/com/srs/dormitory/domain/DmsOutsideAccommodationApproval.java @@ -51,12 +51,12 @@ private static final long serialVersionUID=1L; private String applyNo; /** - * 审批节点(1=辅导员,2=二级学院书记,3=学工处,4=学校领导) + * 审批节点 */ - @ApiModelProperty("审批节点(1=辅导员,2=二级学院书记,3=学工处,4=学校领导)") + @ApiModelProperty("审批节点") @TableField("approval_node") - @Excel(name = "审批节点" , readConverterExp = "1==辅导员,2=二级学院书记,3=学工处,4=学校领导") - private Long approvalNode; + @Excel(name = "审批节点") + private String approvalNode; /** * 审批人ID diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java index 04a2974..2998f59 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationEndListener.java @@ -119,10 +119,10 @@ public class OutsideAccommodationEndListener implements ExecutionListener { // 查询审批记录是否存在 OutsideAccommodationApproval approval = outsideAccommodationApprovalMapper.selectOutsideAccommodationApprovalByStuName(studentName, studentNo, SecurityUtils.getLoginUser().getUser().getUserId()); if (approval == null) { - outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(approval); + outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(outsideAccommodationApproval); } else { approval.setId(approval.getId()); - outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(approval); + outsideAccommodationApprovalMapper.insertDmsOutsideAccommodationApproval(outsideAccommodationApproval); } } } \ No newline at end of file diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationStartListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationStartListener.java index 165bbc3..a4fa334 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationStartListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/outsideAccommodation/OutsideAccommodationStartListener.java @@ -99,7 +99,7 @@ public class OutsideAccommodationStartListener implements ExecutionListener { // 二级学院书记开始审批前 → 找到对应二级学院书记 // 查询角色ID=106(二级学院书记)的所有用户 SysUser queryUser = new SysUser(); - queryUser.setRoleId(106L); // 学务角色固定ID + queryUser.setRoleId(106L); // 二级学院书记角色固定ID List academicAffairsUsers = sysUserService.selectAllocatedList(queryUser); if (academicAffairsUsers.isEmpty()) { throw new RuntimeException("未查询到角色(二级学院书记)的用户");