root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~

Browse Source
This commit is contained in:
淋雨一直走YH
2023-10-06 20:46:28 +08:00
parent 7bc57c75dc
commit c45d3ed75d
10 changed files with 126 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mjkf-xinke-plugin/mjkf-xinke-plugin-sys/src/main/java/mjkf/xinke/sys/modular/role/service/impl/SysRoleServiceImpl.java
View File

@@ -411,7 +411,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
apiName = annotationValue;
}
}
permissionResult.add(patternsCondition.getPatterns().iterator().next() + StrUtil.BRACKET_START + apiName + StrUtil.BRACKET_END);
String nm = StrUtil.BRACKET_START + apiName + StrUtil.BRACKET_END;
patternsCondition.getPatterns().forEach(pt -> permissionResult.add(pt + nm));
}
}
}));

8
mjkf-xinke-plugin/mjkf-xinke-plugin-sys/src/main/java/mjkf/xinke/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@@ -203,8 +203,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public Page<SysUser> page(SysUserPageParam sysUserPageParam) {
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(sysUserPageParam.getSearchKey())) {
queryWrapper.lambda().like(SysUser::getAccount, sysUserPageParam.getSearchKey()).or()
.like(SysUser::getName, sysUserPageParam.getSearchKey());
queryWrapper.lambda().and(q -> q.like(SysUser::getAccount, sysUserPageParam.getSearchKey()).or()
.like(SysUser::getName, sysUserPageParam.getSearchKey()));
}
if (ObjectUtil.isNotEmpty(sysUserPageParam.getOrgId())) {
queryWrapper.lambda().eq(SysUser::getOrgId, sysUserPageParam.getOrgId());
@@ -1163,9 +1163,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
queryWrapper.lambda().in(SysUser::getId, StrUtil.split(sysUserExportParam.getUserIds(), StrUtil.COMMA));
} else {
if (ObjectUtil.isNotEmpty(sysUserExportParam.getSearchKey())) {
queryWrapper.lambda().like(SysUser::getAccount, sysUserExportParam.getSearchKey())
queryWrapper.lambda().and(q -> q.like(SysUser::getAccount, sysUserExportParam.getSearchKey())
.or().like(SysUser::getName, sysUserExportParam.getSearchKey())
.or().like(SysUser::getPhone, sysUserExportParam.getSearchKey());
.or().like(SysUser::getPhone, sysUserExportParam.getSearchKey()));
}
if (ObjectUtil.isNotEmpty(sysUserExportParam.getUserStatus())) {
queryWrapper.lambda().eq(SysUser::getUserStatus, sysUserExportParam.getUserStatus());