admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工作流

Browse Source
This commit is contained in:
pengjie 2024-03-19 09:56:31 +08:00
parent b1df24471a
commit 7414ec63b4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemDeptMapper.java
View File

@ -25,6 +25,6 @@ public interface SystemDeptMapper extends BaseMapper<SystemDept> {
* @param deptId 父部门 * @param deptId 父部门
* @return 子部门列表，type字段固定返回固定值 dept * @return 子部门列表，type字段固定返回固定值 dept
*/ */
@Select("SELECT dept_id id, dept_name `name`, 'dept' AS 'type' FROM system_dept WHERE parent_id=#{deptId}") @Select("SELECT dept_id id, dept_name `name`, 'dept' AS 'type' FROM system_dept WHERE parent_id=#{deptId} AND sn = #{sn}")
List<OrgTreeVo> selectByDept(@Param("deptId") String deptId); List<OrgTreeVo> selectByDept(@Param("deptId") String deptId, @Param("sn") String sn);
} }

7
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.basicdata.service.impl; package com.zhgd.xmgl.modules.basicdata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.wflow.bean.do_.DeptDo; import com.wflow.bean.do_.DeptDo;
import com.wflow.bean.do_.RoleDo; import com.wflow.bean.do_.RoleDo;
import com.wflow.bean.do_.UserDeptDo; import com.wflow.bean.do_.UserDeptDo;
@ -10,12 +11,14 @@ import com.wflow.bean.vo.OrgTreeVo;
import com.wflow.bean.vo.UserVo; import com.wflow.bean.vo.UserVo;
import com.wflow.service.OrgRepositoryService; import com.wflow.service.OrgRepositoryService;
import com.zhgd.xmgl.modules.basicdata.entity.SystemDept; import com.zhgd.xmgl.modules.basicdata.entity.SystemDept;
import com.zhgd.xmgl.modules.basicdata.entity.SystemRole;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole; import com.zhgd.xmgl.modules.basicdata.entity.SystemUserRole;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemDeptMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemDeptMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemRoleMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserRoleMapper; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserRoleMapper;
import com.zhgd.xmgl.security.SecurityUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -135,7 +138,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
@Override @Override
public List<OrgTreeVo> getSubDeptById(String parentId) { public List<OrgTreeVo> getSubDeptById(String parentId) {
return systemDeptMapper.selectByDept(parentId); return systemDeptMapper.selectByDept(parentId, SecurityUtil.getUser().getSn());
} }
@Override @Override
@ -161,7 +164,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
@Override @Override
public List<RoleDo> getSysAllRoles() { public List<RoleDo> getSysAllRoles() {
try { try {
return systemRoleMapper.selectList(null).stream() return systemRoleMapper.selectList(Wrappers.<SystemRole>lambdaQuery().eq(SystemRole::getSn, SecurityUtil.getUser().getSn())).stream()
.map(r -> new RoleDo(r.getRoleId().toString(), r.getRoleName())) .map(r -> new RoleDo(r.getRoleId().toString(), r.getRoleName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} catch (Exception e) { } catch (Exception e) {