diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index f294709e..d72d9cfa 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -7,9 +7,11 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ImportExcelUtil; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; +import com.jero.modules.sys.entity.LawsWorkingGroup; import com.jero.modules.sys.entity.LawsWorkingGroupUser; import com.jero.modules.sys.entity.LawsWorkingGroupUserImport; import com.jero.modules.sys.service.ILawsWorkingGroupUserService; @@ -21,6 +23,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -58,6 +61,7 @@ public class LawsWorkingGroupUserController extends JeroController asList = Arrays.asList(userId.split(",")); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -108,7 +115,7 @@ public class LawsWorkingGroupUserController extends JeroController list = lawsWorkingGroupUserService.list(wrapper); - if (CollectionUtils.isEmpty(list)) { + if (!CollectionUtils.isEmpty(list)) { String workNo; List collect = list.stream().map(LawsWorkingGroupUser::getUserId).distinct().collect(Collectors.toList()); StringJoiner joiner = new StringJoiner(","); @@ -144,6 +151,12 @@ public class LawsWorkingGroupUserController extends JeroController lawsWorkingGroupUserSearch(String realname, String username, String userRoleName, String userPostName); + + /** + * 校验用户有无权限 + * @author LQT + * @date 2023/11/8 17:27 + * @param workingGroupId 工作id + * @return void + */ + void checkAuth(String workingGroupId); } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java index 5f11f807..05caa9cb 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java @@ -2,10 +2,19 @@ package com.jero.modules.sys.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.laws.common.constant.ResultCommon; +import com.jero.modules.sys.entity.LawsWorkingGroup; import com.jero.modules.sys.entity.LawsWorkingGroupUser; import com.jero.modules.sys.mapper.LawsWorkingGroupUserMapper; +import com.jero.modules.sys.service.ILawsWorkingGroupService; import com.jero.modules.sys.service.ILawsWorkingGroupUserService; import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; @@ -14,25 +23,16 @@ import com.jero.modules.system.service.ISysRoleService; import com.jero.modules.system.service.ISysUserRoleService; import com.jero.modules.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; - -import java.util.ArrayList; -import java.util.List; -import java.util.Date; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.query.QueryGenerator; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** @@ -51,6 +51,8 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl