From ba5dbf1302999abf4c4e986b6cbb9da5e4e2b994 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Mon, 29 Apr 2024 15:18:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=82=A3=E8=80=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinelu/framework/aspectj/DataScopeAspect.java | 15 ++------------- .../dto/patientblacklist/PatientBlacklistDto.java | 3 ++- .../patientblacklist/PatientBlacklistMapper.java | 12 ++++++------ .../impl/PatientBlacklistServiceImpl.java | 2 ++ .../PatientPreHospitalizationServiceImpl.java | 2 ++ .../patientblacklist/PatientBlacklistMapper.xml | 2 ++ .../PatientPreHospitalizationMapper.xml | 2 ++ .../com/xinelu/system/domain/vo/AgencyNameVO.java | 2 +- .../com/xinelu/system/mapper/SysUserMapper.java | 12 ++++++------ 9 files changed, 25 insertions(+), 27 deletions(-) diff --git a/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java b/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java index 577004d2..c8a9dd9c 100644 --- a/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java +++ b/postdischarge-framework/src/main/java/com/xinelu/framework/aspectj/DataScopeAspect.java @@ -91,23 +91,12 @@ public class DataScopeAspect { break; } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) { // 自定数据权限 sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, + " OR {}.department_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId())); } else if(DATA_SCOPE_AGENCY.equals(dataScope)){ // 机构数据权限 sqlString.append(StringUtils.format(" OR {}.hospital_agency_id = {} ", anencyAlias, user.getHospitalAgencyId())); } else if (DATA_SCOPE_DEPT.equals(dataScope)) { // 部门数据权限 - sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); - } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) { // 部门及以下数据权限 - sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", - deptAlias, user.getDeptId(), user.getDeptId())); - } else if (DATA_SCOPE_SELF.equals(dataScope)) { // 仅本人数据权限 - if (StringUtils.isNotBlank(userAlias)) { - sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); - } else { - // 数据权限为仅本人且没有userAlias别名不查询任何数据 - sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); - } + sqlString.append(StringUtils.format(" OR {}.department_id = {} ", deptAlias, user.getDepartmentId())); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistDto.java index 91e253a4..d3b5240b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistDto.java @@ -1,5 +1,6 @@ package com.xinelu.manage.dto.patientblacklist; +import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +10,7 @@ import lombok.Data; * @create: 2024-02-28 13:15 **/ @Data -public class PatientBlacklistDto { +public class PatientBlacklistDto extends BaseEntity { /** 患者id */ private Long patientId; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java index f477b709..1562278d 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java @@ -18,7 +18,7 @@ public interface PatientBlacklistMapper { * @param id 患者-黑明单关系主键 * @return 患者-黑明单关系 */ - public PatientBlacklistVo selectPatientBlacklistById(Long id); + PatientBlacklistVo selectPatientBlacklistById(Long id); /** * 查询患者-黑明单关系列表 @@ -26,7 +26,7 @@ public interface PatientBlacklistMapper { * @param patientBlacklist 患者-黑明单关系 * @return 患者-黑明单关系集合 */ - public List selectPatientBlacklistList(PatientBlacklistDto patientBlacklist); + List selectPatientBlacklistList(PatientBlacklistDto patientBlacklist); /** * 新增患者-黑明单关系 @@ -34,7 +34,7 @@ public interface PatientBlacklistMapper { * @param patientBlacklist 患者-黑明单关系 * @return 结果 */ - public int insertPatientBlacklist(PatientBlacklist patientBlacklist); + int insertPatientBlacklist(PatientBlacklist patientBlacklist); /** * 修改患者-黑明单关系 @@ -42,7 +42,7 @@ public interface PatientBlacklistMapper { * @param patientBlacklist 患者-黑明单关系 * @return 结果 */ - public int updatePatientBlacklist(PatientBlacklist patientBlacklist); + int updatePatientBlacklist(PatientBlacklist patientBlacklist); /** * 删除患者-黑明单关系 @@ -50,7 +50,7 @@ public interface PatientBlacklistMapper { * @param id 患者-黑明单关系主键 * @return 结果 */ - public int deletePatientBlacklistById(Long id); + int deletePatientBlacklistById(Long id); /** * 批量删除患者-黑明单关系 @@ -58,5 +58,5 @@ public interface PatientBlacklistMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deletePatientBlacklistByIds(Long[] ids); + int deletePatientBlacklistByIds(Long[] ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java index 50c742e2..74230e2e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.patientblacklist.impl; +import com.xinelu.common.annotation.DataScope; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; @@ -49,6 +50,7 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService { * @return 患者-黑明单关系 */ @Override + @DataScope(anencyAlias = "b") public List selectPatientBlacklistList(PatientBlacklistDto patientBlacklist) { return patientBlacklistMapper.selectPatientBlacklistList(patientBlacklist); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java index 3dc1646b..3f43235f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -1,5 +1,6 @@ package com.xinelu.manage.service.patientprehospitalization.impl; +import com.xinelu.common.annotation.DataScope; import com.xinelu.common.constant.NodeTypeConstants; import com.xinelu.common.constant.PatientTypeConstants; import com.xinelu.common.core.domain.AjaxResult; @@ -110,6 +111,7 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital } @Override + @DataScope(anencyAlias = "p") public List selectList(PatientInfoDto patientInfo) { return preHospitalizationMapper.selectList(patientInfo); } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml index a235dfb1..2b94d540 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml @@ -62,6 +62,8 @@ and b.blacklist_source = #{blacklistSource} + + ${params.dataScope} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml index a5b8161c..2b3f3ba9 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml @@ -338,6 +338,8 @@ and p.registration_no = #{registrationNo} + + ${params.dataScope} order by p.appointment_date diff --git a/postdischarge-system/src/main/java/com/xinelu/system/domain/vo/AgencyNameVO.java b/postdischarge-system/src/main/java/com/xinelu/system/domain/vo/AgencyNameVO.java index a3caf658..b86339e4 100644 --- a/postdischarge-system/src/main/java/com/xinelu/system/domain/vo/AgencyNameVO.java +++ b/postdischarge-system/src/main/java/com/xinelu/system/domain/vo/AgencyNameVO.java @@ -14,7 +14,7 @@ public class AgencyNameVO { /** * 主键id */ - private Long agencyId; + private Long hospitalAgencyId; /** * 机构名称 diff --git a/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java b/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java index 29ec63d6..ef174f75 100644 --- a/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java +++ b/postdischarge-system/src/main/java/com/xinelu/system/mapper/SysUserMapper.java @@ -146,28 +146,28 @@ public interface SysUserMapper { * 剩余机构信息 * * @param agencyName 机构搜索信息 - * @param agencyId 机构id + * @param hospitalAgencyId 机构id * @return AgencyNameVO */ - List selectAgencyList(@Param("agencyName") String agencyName, @Param("agencyId") Long agencyId); + List selectAgencyList(@Param("agencyName") String agencyName, @Param("hospitalAgencyId") Long hospitalAgencyId); /** * 机构查询 * - * @param agencyId 机构id + * @param hospitalAgencyId 机构id * @return */ - List selectBelongAgencyList(Long agencyId); + List selectBelongAgencyList(Long hospitalAgencyId); /** * 剩余科室信息 * * @param departmentName 科室搜索条件 * @param departmentId 科室id - * @param agencyId 机构id + * @param hospitalAgencyId 机构id * @return AgencyNameVO */ - List selectDepartmentList(@Param("departmentName") String departmentName, @Param("departmentId") Long departmentId, @Param("agencyId") Long agencyId); + List selectDepartmentList(@Param("departmentName") String departmentName, @Param("departmentId") Long departmentId, @Param("hospitalAgencyId") Long hospitalAgencyId); /** * 科室信息