wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-12-14 18:22:45 +08:00
commit b93f66c56c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
View File

@ -720,7 +720,7 @@ public class DingtalkBusiness {
if (token != null && token.length() > 0) {
StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskProcessRecord.getStaffId());
if (taskProcessRecord.getStaffId().longValue() != resultDetail.getId().longValue()) {
if (taskProcessRecord.getStaffId().longValue() != resultDetail.getStaffId().longValue()) {
//自己评论自己的不允许给自己发消息
StaffSimpleInfo toStaffSimpleInfo = staffService.selectStaffSimpleInfo(resultDetail.getStaffId());

2
src/main/java/com/lz/modules/sys/service/impl/ShiroServiceImpl.java
View File

@ -35,7 +35,7 @@ public class ShiroServiceImpl implements ShiroService {
public Set<String> getUserPermissions(SysUserEntity user) {
List<String> permsList = null;
//系统管理员，拥有最高权限
if(user.getUserId() == Constant.SUPER_ADMIN || user.getType() == 1){
if(user.getUserId() == Constant.SUPER_ADMIN ){
List<SysMenuEntity> menuList = sysMenuDao.selectList(null);
permsList = new ArrayList<>(menuList.size());
for(SysMenuEntity menu : menuList){