|
|
@@ -5,13 +5,17 @@ import cn.hutool.core.collection.CollectionUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ydtech.constants.SysConstants;
|
|
|
+import com.ydtech.modules.admin.constants.UserWorkStatus;
|
|
|
import com.ydtech.modules.admin.dao.SysMenuMapper;
|
|
|
import com.ydtech.modules.admin.model.SysMenu;
|
|
|
import com.ydtech.modules.admin.model.SysMenuVo;
|
|
|
import com.ydtech.modules.admin.model.SysRoleMenu;
|
|
|
+import com.ydtech.modules.admin.model.SysUser;
|
|
|
import com.ydtech.modules.admin.service.SysMenuService;
|
|
|
import com.ydtech.modules.admin.service.SysRoleMenuKztService;
|
|
|
import com.ydtech.modules.admin.service.SysRoleMenuService;
|
|
|
+import com.ydtech.modules.admin.service.SysUserService;
|
|
|
+import lombok.RequiredArgsConstructor;
|
|
|
import org.apache.commons.compress.utils.Lists;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@@ -25,22 +29,27 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
@Service
|
|
|
+@RequiredArgsConstructor
|
|
|
public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
|
|
|
implements SysMenuService {
|
|
|
|
|
|
- @Autowired
|
|
|
- private SysRoleMenuService sysRoleMenuService;
|
|
|
+ private final SysUserService sysUserService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private SysRoleMenuKztService sysRoleMenuKztService;
|
|
|
+ private final SysRoleMenuService sysRoleMenuService;
|
|
|
|
|
|
- @Autowired
|
|
|
- private SysMenuMapper sysMenuMapper;
|
|
|
+ private final SysRoleMenuKztService sysRoleMenuKztService;
|
|
|
+
|
|
|
+ private final SysMenuMapper sysMenuMapper;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
public List<SysMenu> findTree(String userName, int menuType) {
|
|
|
List<SysMenu> sysMenus = new ArrayList<>();
|
|
|
+ SysUser sysUser = sysUserService.getById(userName);
|
|
|
+ Integer status = sysUser.getStatus();
|
|
|
+ if (!UserWorkStatus.UWS_1.getCode().equals(status)) {
|
|
|
+ return sysMenus;
|
|
|
+ }
|
|
|
List<SysMenu> menus = findByUser(userName);
|
|
|
for (SysMenu menu : menus) {
|
|
|
if (menu.getParentId() == null || menu.getParentId().equalsIgnoreCase("0")) {
|