From bd9cf1a87d50cc7cb29118cc85f397a7ab7228e9 Mon Sep 17 00:00:00 2001 From: heheng <heheng@123456> Date: 星期一, 16 十二月 2024 16:51:01 +0800 Subject: [PATCH] 增加监管机构数据限制 --- assess-common/src/main/java/com/gkhy/assess/common/constant/SuperAccountConstant.java | 7 +++++++ assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectSupplementServiceImpl.java | 9 +++++++++ assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java | 7 +++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/assess-common/src/main/java/com/gkhy/assess/common/constant/SuperAccountConstant.java b/assess-common/src/main/java/com/gkhy/assess/common/constant/SuperAccountConstant.java new file mode 100644 index 0000000..c900a0c --- /dev/null +++ b/assess-common/src/main/java/com/gkhy/assess/common/constant/SuperAccountConstant.java @@ -0,0 +1,7 @@ +package com.gkhy.assess.common.constant; + +public class SuperAccountConstant { + + public static final String SUPER_ADMIN = "admin"; + public static final String ADMINISTRATOR = "administrator"; +} diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java index 2346449..b524d6d 100644 --- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java +++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectServiceImpl.java @@ -2,10 +2,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.gkhy.assess.common.api.CommonPage; +import com.gkhy.assess.common.constant.SuperAccountConstant; import com.gkhy.assess.common.enums.DeleteFlagEnum; import com.gkhy.assess.common.enums.UserIdentityEnum; import com.gkhy.assess.common.exception.ApiException; import com.gkhy.assess.common.utils.PageUtil; +import com.gkhy.assess.common.utils.StringUtils; import com.gkhy.assess.system.domain.AssPlanPerson; import com.gkhy.assess.system.domain.AssProject; import com.gkhy.assess.system.domain.vo.PersonRecognitionVO; @@ -49,6 +51,11 @@ throw new ApiException("用户机构id为空"); } project.setAgencyId(user.getAgencyId()); + }else { + //监管机构只能查看本辖区的项目 + if (!SuperAccountConstant.ADMINISTRATOR.equals(user.getUsername()) && !SuperAccountConstant.SUPER_ADMIN.equals(user.getUsername())){ + project.setCity(user.getManageRegion()); + } } PageUtil.startPage(); List<AssProject> projects=baseMapper.projectList(project); diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectSupplementServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectSupplementServiceImpl.java index 0ef40d3..57d85fe 100644 --- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectSupplementServiceImpl.java +++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/AssProjectSupplementServiceImpl.java @@ -3,6 +3,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.assess.common.api.CommonPage; +import com.gkhy.assess.common.constant.SuperAccountConstant; import com.gkhy.assess.common.enums.UserIdentityEnum; import com.gkhy.assess.common.exception.ApiException; import com.gkhy.assess.common.utils.PageUtil; @@ -107,6 +108,14 @@ throw new ApiException("用户机构id为空"); } projectSupplement.setAgencyId(user.getAgencyId()); + }else { + if (SuperAccountConstant.ADMINISTRATOR.equals(user.getUsername()) || SuperAccountConstant.SUPER_ADMIN.equals(user.getUsername())){ + PageUtil.startPage(); + List<AssProjectSupplement> projects=baseMapper.projectList(projectSupplement); + return CommonPage.restPage(projects); + }else { + return CommonPage.restPage(new ArrayList<>()); + } } PageUtil.startPage(); List<AssProjectSupplement> projects=baseMapper.projectList(projectSupplement); -- Gitblit v1.9.2