ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.97.8.94:19527/yj/zn-cloud

Browse Source
This commit is contained in:
aikai 2024-03-28 14:48:43 +08:00
commit be68ab7d4f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java
View File

@ -36,9 +36,7 @@ public class BpmOALeaveServiceImpl extends BpmOABaseService implements BpmOALeav
/** /**
* OA 请假对应的流程定义 KEY * OA 请假对应的流程定义 KEY
*/ */
// public static final String PROCESS_KEY = "oa_leave"; public static final String PROCESS_KEY = "oa_leave";
public static final String PROCESS_KEY = "oalv";
@Resource @Resource
private BpmOALeaveMapper leaveMapper; private BpmOALeaveMapper leaveMapper;

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
View File

@ -21,7 +21,7 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
.likeIfPresent(RoleDO::getCode, reqVO.getCode()) .likeIfPresent(RoleDO::getCode, reqVO.getCode())
.eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) .eqIfPresent(RoleDO::getStatus, reqVO.getStatus())
.betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(RoleDO::getId)); .orderByAsc(RoleDO::getSort));
} }
default RoleDO selectByName(String name) { default RoleDO selectByName(String name) {