diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java index a42fb464..e49efba6 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java @@ -257,4 +257,13 @@ public class InspectionInfoController extends BaseController { inspectionWorkNodeService.recheck(inspectionWorkNode); return success("操作成功"); } + + /** + * 判断当前登陆人是否有重检、重审、退办理的权限(app) + * @return + */ + @GetMapping("isExamine") + public CommonResult isExamine(){ + return success(inspectionInfoService.isExamine()); + } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index b257ef81..9d3d7b69 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -159,8 +159,10 @@ public class PartnerOwnController extends BaseController { * 检测线图 */ @GetMapping("/chartInfoRatio") - public CommonResult chartInfoRatio(Long partnerId,String unit) - { + public CommonResult chartInfoRatio(Long partnerId,String unit) throws Exception { + if (ObjectUtil.isNull(partnerId)) { + partnerId = partnerList.shopInfoByUserId().getPartnerId(); + } return success(partnerList.chartInfoRatio(partnerId, unit)); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java index 948ad93e..c71c609d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java @@ -103,4 +103,10 @@ public interface IInspectionInfoService extends IService * @return */ List getWeorkNodesById(Integer inspectionId); + + /** + * 判断app当前检测人是否有审核权限 + * @return + */ + Boolean isExamine(); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java index 69e3dc7a..12e01f87 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java @@ -14,6 +14,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.appBase.controller.admin.InspectionSocket; import cn.iocoder.yudao.module.custom.entity.CustomerMain; import cn.iocoder.yudao.module.custom.service.CustomerMainService; @@ -54,6 +55,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import static cn.iocoder.yudao.framework.common.config.CommonStr.USER_TYPE_CUS; + /** * 【请填写功能名称】Service业务层处理 * @@ -137,13 +140,14 @@ public class InspectionInfoServiceImpl extends ServiceImpl getWeorkNodesById(Integer inspectionId) { return workNodeService.getWeorkNodesById(inspectionId); } + + /** + * 判断app当前检测人是否有审核权限 + * + * @return + */ + @Override + public Boolean isExamine() { + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + //获取当前登陆人的所有角色 + List userRoles = roleService.getByUserId(loginUser.getId()); + List userRoleIds = userRoles.stream().map(UserRoleDO::getRoleId).collect(Collectors.toList()); + List roleList = roleService.getRoleList(userRoleIds); + + //判断当前角色集合中的code是否包含jcyszz + if (CollectionUtil.isNotEmpty(roleList)) { + List filteredRoleList = roleList.stream() + .filter(role -> role.getCode().contains("jcsfdl")) + .collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(filteredRoleList)) { + return true; + } + } + return false; + } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java index 8fe5e2e6..5851118f 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java @@ -91,10 +91,10 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl { int updateSetOpenId(@Param("userId")Long userId,@Param("openId")String openId); int updateCusInfo(@Param("entity") UserInfoVO userInfoVO); + + AdminUserDO getUserByMobileTenantIgnore(String mobile); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java index f32ed626..501dbc50 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java @@ -145,6 +145,13 @@ public interface AdminUserService extends IService { * @return 用户对象信息 */ AdminUserDO getUserByMobile(String mobile); + /** + * 通过手机号获取用户(不带租户id) + * + * @param mobile 手机号 + * @return 用户对象信息 + */ + AdminUserDO getUserByMobileTenantIgnore(String mobile); /** * 获得用户分页列表 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 53b12a1a..ec2e2a17 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -303,6 +303,11 @@ public class AdminUserServiceImpl extends ServiceImpl getUserPage(UserPageReqVO reqVO) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml index 40cb035c..dfcc0539 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/SysUserMapper.xml @@ -75,4 +75,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND deleted = 0 limit 1 +