WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 推送至业务 #17

Merged
XiaoLFeng merged 46 commits from develop into master 2024-04-17 00:55:37 +08:00
Conversation 0 Commits 46 Files Changed 116 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5b87e6f4f - Show all commits

4
src/main/java/com/jsl/oa/aspect/BusinessAop.java
View File

@ -94,7 +94,9 @@ public class BusinessAop {
} }
Object result = pjp.proceed(); Object result = pjp.proceed();
log.info("<==[DAO] 返回数据类型 {}", declaringType.descriptorString()); log.info("<==[DAO] 返回数据类型 {}", declaringType.descriptorString());
log.debug("\t> 传出信息：{}", result.toString()); if (result != null) {
log.debug("\t> 传出信息：{}", result);
}
return result; return result;
} }
} }

2
src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
View File

@ -157,7 +157,7 @@ public class UserServiceImpl implements UserService {
if (roleUserDO == null) { if (roleUserDO == null) {
return ResultUtil.error(ErrorCode.NOT_PERMISSION); return ResultUtil.error(ErrorCode.NOT_PERMISSION);
} }
RoleDO roleDO = roleDAO.getRoleByRoleName("admin"); RoleDO roleDO = roleDAO.getRoleByRoleName("console");
if (!roleUserDO.getRid().equals(roleDO.getId())) { if (!roleUserDO.getRid().equals(roleDO.getId())) {
return ResultUtil.error(ErrorCode.NOT_PERMISSION); return ResultUtil.error(ErrorCode.NOT_PERMISSION);
} }