From 086cb43359c6f8648213f3f9d6f6e13bd7485353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com> Date: Thu, 29 Jan 2026 23:28:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B2=97=E4=BD=8D=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E7=94=9F=E7=89=A9=E5=AE=89=E5=85=A8=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=88=86=E7=A6=BBuserId=EF=BC=8Cdep?= =?UTF-8?q?tId=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhyc/common/annotation/DataScope.java | 2 +- .../base/controller/BasSheepController.java | 1 + .../service/impl/BasSheepServiceImpl.java | 3 ++ .../controller/DewormController.java | 3 +- .../controller/DiagnosisController.java | 2 + .../controller/DisinfectController.java | 2 + .../controller/HealthController.java | 2 + .../controller/ImmunityController.java | 2 + .../QuarantineReportController.java | 2 + .../controller/SwMedicineUsageController.java | 2 + .../controller/TreatmentController.java | 2 + .../zhyc/module/biosafety/domain/Deworm.java | 4 +- .../module/biosafety/domain/Diagnosis.java | 3 ++ .../module/biosafety/domain/Disinfect.java | 3 ++ .../zhyc/module/biosafety/domain/Health.java | 3 ++ .../module/biosafety/domain/Immunity.java | 3 ++ .../biosafety/domain/QuarantineReport.java | 3 ++ .../biosafety/domain/SwMedicineUsage.java | 3 ++ .../module/biosafety/domain/Treatment.java | 3 ++ .../service/impl/DewormServiceImpl.java | 3 ++ .../service/impl/DiagnosisServiceImpl.java | 2 + .../service/impl/DisinfectServiceImpl.java | 3 ++ .../service/impl/HealthServiceImpl.java | 2 + .../service/impl/ImmunityServiceImpl.java | 3 ++ .../impl/QuarantineItemsServiceImpl.java | 1 + .../impl/QuarantineReportServiceImpl.java | 3 ++ .../impl/SwMedicineUsageServiceImpl.java | 3 ++ .../service/impl/TreatmentServiceImpl.java | 3 ++ .../common/controller/UserPostController.java | 4 +- .../com/zhyc/module/common/domain/Dept.java | 22 ++++++++++ .../com/zhyc/module/common/domain/Post.java | 3 +- .../com/zhyc/module/common/domain/User.java | 7 +++- .../zhyc/module/common/mapper/DeptMapper.java | 15 +++++++ .../zhyc/module/common/mapper/UserMapper.java | 2 +- .../module/common/service/UserService.java | 2 +- .../service/impl/UserPostServiceImpl.java | 15 ++++++- .../resources/mapper/base/BasSheepMapper.xml | 7 +++- .../mapper/biosafety/DewormMapper.xml | 5 ++- .../mapper/biosafety/DiagnosisMapper.xml | 5 +++ .../mapper/biosafety/DisinfectMapper.xml | 8 ++-- .../mapper/biosafety/HealthMapper.xml | 5 ++- .../mapper/biosafety/ImmunityMapper.xml | 5 ++- .../biosafety/QuarantineReportMapper.xml | 9 ++++- .../biosafety/SwMedicineUsageMapper.xml | 5 +++ .../mapper/biosafety/TreatmentMapper.xml | 9 ++++- .../resources/mapper/common/DeptMapper.xml | 33 +++++++++++++++ .../resources/mapper/common/UserMapper.xml | 40 ++++++++++++++----- 47 files changed, 237 insertions(+), 35 deletions(-) create mode 100644 zhyc-module/src/main/java/com/zhyc/module/common/domain/Dept.java create mode 100644 zhyc-module/src/main/java/com/zhyc/module/common/mapper/DeptMapper.java create mode 100644 zhyc-module/src/main/resources/mapper/common/DeptMapper.xml diff --git a/zhyc-common/src/main/java/com/zhyc/common/annotation/DataScope.java b/zhyc-common/src/main/java/com/zhyc/common/annotation/DataScope.java index 05265e5..4897ca9 100644 --- a/zhyc-common/src/main/java/com/zhyc/common/annotation/DataScope.java +++ b/zhyc-common/src/main/java/com/zhyc/common/annotation/DataScope.java @@ -11,7 +11,7 @@ import java.lang.annotation.Target; * * @author ruoyi */ -@Target(ElementType.METHOD) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface DataScope diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java index 49f2c40..a6e0252 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java @@ -46,6 +46,7 @@ public class BasSheepController extends BaseController { return getDataTable(list); } +//查询耳号列表 @GetMapping("/earNumbers") public AjaxResult searchEarNumbers(@RequestParam("query") String query) { try { diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java index 938eeec..bff0d19 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepServiceImpl.java @@ -1,6 +1,8 @@ package com.zhyc.module.base.service.impl; import java.util.List; + +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.mapper.BasSheepMapper; @@ -51,6 +53,7 @@ public class BasSheepServiceImpl implements IBasSheepService * @return */ @Override + @DataScope(deptAlias = "b", userAlias = "b") public List searchEarNumbers(String query) { return basSheepMapper.searchEarNumbers(query); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java index 6fb5fba..1c7c8aa 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DewormController.java @@ -78,7 +78,8 @@ public class DewormController extends BaseController @PostMapping public AjaxResult add(@RequestBody Deworm deworm) { - System.out.println(deworm); + deworm.setDeptId(getDeptId()); + deworm.setUserId(getUserId()); return toAjax(dewormService.insertDeworm(deworm)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java index 3b7aff6..c7968e8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DiagnosisController.java @@ -77,6 +77,8 @@ public class DiagnosisController extends BaseController @PostMapping public AjaxResult add(@RequestBody Diagnosis diagnosis) { + diagnosis.setDeptId(getDeptId()); + diagnosis.setUserId(getUserId()); return toAjax(diagnosisService.insertDiagnosis(diagnosis)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java index 7e2f934..315196e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/DisinfectController.java @@ -78,6 +78,8 @@ public class DisinfectController extends BaseController @PostMapping public AjaxResult add(@RequestBody Disinfect disinfect) { + disinfect.setDeptId(getDeptId()); + disinfect.setUserId(getUserId()); return toAjax(disinfectService.insertDisinfect(disinfect)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java index c1798ca..4066006 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/HealthController.java @@ -79,6 +79,8 @@ public class HealthController extends BaseController @PostMapping public AjaxResult add(@RequestBody Health health) { + health.setDeptId(getDeptId()); + health.setUserId(getUserId()); return toAjax(healthService.insertHealth(health)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java index f49376c..2abc6d6 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/ImmunityController.java @@ -78,6 +78,8 @@ public class ImmunityController extends BaseController @PostMapping public AjaxResult add(@RequestBody Immunity immunity) { + immunity.setDeptId(getDeptId()); + immunity.setUserId(getUserId()); return toAjax(immunityService.insertImmunity(immunity)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java index 1c06745..dee5d75 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/QuarantineReportController.java @@ -78,6 +78,8 @@ public class QuarantineReportController extends BaseController @PostMapping public AjaxResult add(@RequestBody QuarantineReport quarantineReport) { + quarantineReport.setDeptId(getDeptId()); + quarantineReport.setUserId(getUserId()); return toAjax(quarantineReportService.insertQuarantineReport(quarantineReport)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java index 7e09fd5..d77739a 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/SwMedicineUsageController.java @@ -84,6 +84,8 @@ public class SwMedicineUsageController extends BaseController @PostMapping public AjaxResult add(@RequestBody SwMedicineUsage swMedicineUsage) { + swMedicineUsage.setDeptId(getDeptId()); + swMedicineUsage.setUserId(getUserId()); return toAjax(swMedicineUsageService.insertSwMedicineUsage(swMedicineUsage)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java index 85d5591..38c23e3 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/controller/TreatmentController.java @@ -78,6 +78,8 @@ public class TreatmentController extends BaseController @PostMapping public AjaxResult add(@RequestBody Treatment treatment) { + treatment.setDeptId(getDeptId()); + treatment.setUserId(getUserId()); return toAjax(treatmentService.insertTreatment(treatment)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java index 155e5a1..7db3a19 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Deworm.java @@ -54,7 +54,8 @@ public class Deworm extends BaseEntity @Excel(name = "胎次") private Long parity; - + private Long userId; + private Long deptId; /** 药品使用记录 */ @Excel(name = "药品使用记录") @@ -81,4 +82,5 @@ public class Deworm extends BaseEntity // 排序查询 private String orderByColumn; private String isAsc; + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java index 9268f42..14cb984 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Diagnosis.java @@ -106,6 +106,9 @@ public class Diagnosis extends BaseEntity private String orderByColumn; private String isAsc; + private Long userId; + private Long deptId; + public void setGender(String gender) { this.gender = gender; if (gender != null && !gender.trim().isEmpty()) { diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java index 4c6847d..6d24d82 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Disinfect.java @@ -61,6 +61,9 @@ public class Disinfect extends BaseEntity /** 药品名称用于查询*/ private String mediName; + private Long userId; + private Long deptId; + // 药品使用 private List usageDetails; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java index 8ee82bb..9eadf30 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Health.java @@ -69,6 +69,9 @@ public class Health extends BaseEntity @Excel(name = "备注") private String comment; + private Long userId; + private Long deptId; + // 药品使用 private List usageDetails; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java index e9bcada..70ccaa0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Immunity.java @@ -78,6 +78,9 @@ public class Immunity extends BaseEntity @Excel(name = "备注") private String comment; + private Long userId; + private Long deptId; + // 药品使用 private List usageDetails; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java index 0395033..ee9f277 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/QuarantineReport.java @@ -98,6 +98,9 @@ public class QuarantineReport extends BaseEntity @Excel(name = "备注") private String comment; + private Long userId; + private Long deptId; + public void setGender(String gender) { this.gender = gender; this.genderName = Gender.getDescByCode(Integer.valueOf(gender)); diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java index eb11d05..62e212f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/SwMedicineUsage.java @@ -53,6 +53,9 @@ public class SwMedicineUsage extends BaseEntity @Excel(name = "使用类型",width = 20, needMerge = true) private String useType; + private Long userId; + private Long deptId; + /** 药品使用记录详情信息 */ @Excel private List swMedicineUsageDetailsList; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java index 994cca8..f6dce30 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/domain/Treatment.java @@ -104,6 +104,9 @@ public class Treatment extends BaseEntity @Excel(name = "药品使用记录id") private Integer usageId; + private Long userId; + private Long deptId; + // 药品使用 private List usageDetails; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java index cad4485..716a333 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DewormServiceImpl.java @@ -3,6 +3,8 @@ package com.zhyc.module.biosafety.service.impl; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; @@ -58,6 +60,7 @@ public class DewormServiceImpl implements IDewormService * @return 驱虫 */ @Override + @DataScope(deptAlias = "s", userAlias = "s") public List selectDewormList(Deworm deworm) { String[] sheepNos = null; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java index 5c89e11..cd247e0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DiagnosisServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import java.util.Objects; +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.module.base.domain.BasSheep; @@ -60,6 +61,7 @@ public class DiagnosisServiceImpl implements IDiagnosisService * @return 诊疗结果 */ @Override + @DataScope(deptAlias = "sd", userAlias = "sd") public List selectDiagnosisList(Diagnosis diagnosis) { String[] sheepNos = null; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java index 8e98bf4..2b178a5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/DisinfectServiceImpl.java @@ -2,6 +2,8 @@ package com.zhyc.module.biosafety.service.impl; import java.util.ArrayList; import java.util.List; + +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; @@ -59,6 +61,7 @@ public class DisinfectServiceImpl implements IDisinfectService * @return 消毒记录 */ @Override + @DataScope(deptAlias = "sd", userAlias = "sd") public List selectDisinfectList(Disinfect disinfect) { return disinfectMapper.selectDisinfectList(disinfect); diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java index 5535cce..34d0e7b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/HealthServiceImpl.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; @@ -62,6 +63,7 @@ public class HealthServiceImpl implements IHealthService * @return 保健 */ @Override + @DataScope(deptAlias = "s", userAlias = "s") public List selectHealthList(Health health) { String[] sheepNos = null; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java index 88d0428..d7f0f1e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/ImmunityServiceImpl.java @@ -2,6 +2,8 @@ package com.zhyc.module.biosafety.service.impl; import java.util.ArrayList; import java.util.List; + +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; @@ -61,6 +63,7 @@ public class ImmunityServiceImpl implements IImmunityService * @return 免疫 */ @Override + @DataScope(deptAlias = "s", userAlias = "s") public List selectImmunityList(Immunity immunity) { String[] sheepNos = null; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineItemsServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineItemsServiceImpl.java index 541a759..a4de537 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineItemsServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineItemsServiceImpl.java @@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.service.impl; import java.util.List; +import com.zhyc.common.annotation.DataScope; import com.zhyc.module.biosafety.domain.QuarantineItems; import com.zhyc.module.biosafety.mapper.QuarantineItemsMapper; import com.zhyc.module.biosafety.service.IQuarantineItemsService; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java index d83e8bd..87148e0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/QuarantineReportServiceImpl.java @@ -2,6 +2,8 @@ package com.zhyc.module.biosafety.service.impl; import java.util.ArrayList; import java.util.List; + +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; @@ -46,6 +48,7 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService * @return 检疫记录 */ @Override + @DataScope(deptAlias = "sqr", userAlias = "sqr") public List selectQuarantineReportList(QuarantineReport quarantineReport) { String[] sheepNos = null; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java index 5d9509f..0a1327d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/SwMedicineUsageServiceImpl.java @@ -1,6 +1,8 @@ package com.zhyc.module.biosafety.service.impl; import java.util.List; + +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.module.biosafety.service.ISwMedicineUsageService; @@ -44,6 +46,7 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService * @return 药品使用记录 */ @Override + @DataScope(deptAlias = "smu", userAlias = "smu") public List selectSwMedicineUsageList(SwMedicineUsage swMedicineUsage) { String[] sheepNos = null; diff --git a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java index 293fdff..1c21aa1 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/biosafety/service/impl/TreatmentServiceImpl.java @@ -2,6 +2,8 @@ package com.zhyc.module.biosafety.service.impl; import java.util.ArrayList; import java.util.List; + +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.common.utils.SecurityUtils; import com.zhyc.common.utils.bean.BeanUtils; @@ -65,6 +67,7 @@ public class TreatmentServiceImpl implements ITreatmentService * @return 治疗记录 */ @Override + @DataScope(deptAlias = "t", userAlias = "t") public List selectTreatmentList(Treatment treatment) { String[] sheepNos = null; diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java b/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java index 6e9fa5e..7b63e2e 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/common/controller/UserPostController.java @@ -26,7 +26,9 @@ public class UserPostController { // 根据岗位编码获取用户 @GetMapping("/getUser") public AjaxResult getUserPost(String postCode){ - List list = userService.getUserListByCode(postCode); + User user = new User(); + user.setPostCode(postCode); + List list = userService.getUserListByCode(user); return AjaxResult.success(list); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/domain/Dept.java b/zhyc-module/src/main/java/com/zhyc/module/common/domain/Dept.java new file mode 100644 index 0000000..b840430 --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/common/domain/Dept.java @@ -0,0 +1,22 @@ +package com.zhyc.module.common.domain; + +import com.zhyc.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Dept extends BaseEntity { + private Long deptId; + private Long parentId; + private String ancestors; + private String deptName; + private String orderNum; + private String leader; + private String phone; + private String email; + private String status; + private String delFlag; +} diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/domain/Post.java b/zhyc-module/src/main/java/com/zhyc/module/common/domain/Post.java index 4af0b53..38125a4 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/common/domain/Post.java +++ b/zhyc-module/src/main/java/com/zhyc/module/common/domain/Post.java @@ -1,6 +1,7 @@ package com.zhyc.module.common.domain; import com.zhyc.common.annotation.Excel; +import com.zhyc.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -8,7 +9,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class Post { +public class Post extends BaseEntity { /** 岗位序号 */ @Excel(name = "岗位序号", cellType = Excel.ColumnType.NUMERIC) diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/domain/User.java b/zhyc-module/src/main/java/com/zhyc/module/common/domain/User.java index 75b2c31..a10fb08 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/common/domain/User.java +++ b/zhyc-module/src/main/java/com/zhyc/module/common/domain/User.java @@ -1,5 +1,6 @@ package com.zhyc.module.common.domain; +import com.zhyc.common.core.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,9 +8,10 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class User { +public class User extends BaseEntity { // 用户id - private String userId; + private Long userId; + private Long deptId; // 用户名 private String nickName; // 岗位名称 @@ -17,4 +19,5 @@ public class User { // 岗位编码 private String postCode; + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/mapper/DeptMapper.java b/zhyc-module/src/main/java/com/zhyc/module/common/mapper/DeptMapper.java new file mode 100644 index 0000000..8cd72ab --- /dev/null +++ b/zhyc-module/src/main/java/com/zhyc/module/common/mapper/DeptMapper.java @@ -0,0 +1,15 @@ +package com.zhyc.module.common.mapper; + +import com.zhyc.module.common.domain.Dept; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface DeptMapper { + /** + * 根据部门ID查询其所属二级部门（排除根部门） + */ + Dept selectTopSecondLevelDept(Long deptId); +} diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/mapper/UserMapper.java b/zhyc-module/src/main/java/com/zhyc/module/common/mapper/UserMapper.java index f6d4a92..9e689a8 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/common/mapper/UserMapper.java +++ b/zhyc-module/src/main/java/com/zhyc/module/common/mapper/UserMapper.java @@ -8,5 +8,5 @@ import java.util.List; @Mapper public interface UserMapper { - List getUserListByCode(String postCode); + List getUserListByCode(User user); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/service/UserService.java b/zhyc-module/src/main/java/com/zhyc/module/common/service/UserService.java index 237ba52..d7ad652 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/common/service/UserService.java +++ b/zhyc-module/src/main/java/com/zhyc/module/common/service/UserService.java @@ -5,5 +5,5 @@ import com.zhyc.module.common.domain.User; import java.util.List; public interface UserService { - List getUserListByCode(String postCode); + List getUserListByCode(User postCode); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/common/service/impl/UserPostServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/common/service/impl/UserPostServiceImpl.java index 49ff427..65bb6de 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/common/service/impl/UserPostServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/common/service/impl/UserPostServiceImpl.java @@ -1,6 +1,10 @@ package com.zhyc.module.common.service.impl; +import com.zhyc.common.annotation.DataScope; +import com.zhyc.common.utils.SecurityUtils; +import com.zhyc.module.common.domain.Dept; import com.zhyc.module.common.domain.User; +import com.zhyc.module.common.mapper.DeptMapper; import com.zhyc.module.common.mapper.UserMapper; import com.zhyc.module.common.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -12,9 +16,16 @@ import java.util.List; public class UserPostServiceImpl implements UserService { @Autowired UserMapper userMapper; + @Autowired + DeptMapper deptMapper; + @Override - public List getUserListByCode(String postCode) { - return userMapper.getUserListByCode(postCode); + public List getUserListByCode(User user) { + Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId(); + Dept secondLevel = deptMapper.selectTopSecondLevelDept(deptId); + user.setDeptId(secondLevel.getDeptId()); + System.out.println(secondLevel); + return userMapper.getUserListByCode(user); } } diff --git a/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml index 9e72d5d..1c81ab7 100644 --- a/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml @@ -150,9 +150,12 @@ diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml index b59dca9..f555fb5 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DewormMapper.xml @@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and datetime between #{params.beginDatetime} and #{params.endDatetime} and technical = #{technical} + ${params.dataScope} @@ -78,13 +79,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sw_deworm (sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, breed,datetime, technical, comment, - update_by, update_time, create_by, create_time) + update_by, update_time, create_by, create_time,user_id, dept_id) values (#{d.sheepId}, #{d.usageId}, #{d.variety}, #{d.sheepType}, #{d.gender}, #{d.monthAge}, #{d.parity},#{d.breed}, #{d.datetime}, #{d.technical}, #{d.comment}, - #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime},#{d.userId},#{d.deptId}) diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml index 854dd0a..242edfa 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DiagnosisMapper.xml @@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and result = #{result} and treat_day = #{treatDay} and sd.sheepfold_id = #{sheepfoldId} + ${params.dataScope} ORDER BY datetime DESC @@ -101,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sheepfold_id, create_by, create_time, + user_id, + dept_id, #{treatId}, @@ -118,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sheepfoldId}, #{createBy}, #{createTime}, + #{userId}, + #{deptId}, diff --git a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml index d48020e..89cfa01 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/DisinfectMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ds.sheepfold_name FROM sw_disinfect sd LEFT JOIN da_sheepfold ds ON ds.id = sd.sheepfold_id - WHERE 1 = 1 + 1 = 1 AND sd.sheepfold_id = #{sheepfoldId} AND sd.datetime = #{datetime} AND sd.technician = #{technician} @@ -61,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sm.name like concat('%',#{mediName},'%') ) + ${params.dataScope} + ORDER BY datetime DESC @@ -72,12 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sw_disinfect - (sheepfold_id, datetime, technician, way, usage_id, ratio, comment, update_by, update_time, create_by, create_time) + (sheepfold_id, datetime, technician, way, usage_id, ratio, comment, update_by, update_time, create_by, create_time, user_id,dept_id) values (#{d.sheepfoldId}, #{d.datetime}, #{d.technician}, #{d.way}, #{d.usageId}, #{d.ratio}, #{d.comment}, - #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime},#{d.userId},#{d.deptId}) diff --git a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml index ccb208f..d2faf3d 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/HealthMapper.xml @@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and datetime between #{params.beginDatetime} and #{params.endDatetime} and technical = #{technical} + ${params.dataScope} ORDER BY datetime DESC @@ -81,13 +82,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sw_health (sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, breed,datetime, technical, comment, - update_by, update_time, create_by, create_time) + update_by, update_time, create_by, create_time,user_id,dept_id) values (#{d.sheepId}, #{d.usageId}, #{d.variety}, #{d.sheepType}, #{d.gender}, #{d.monthAge}, #{d.parity},#{d.breed}, #{d.datetime}, #{d.technical}, #{d.comment}, - #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime},#{d.userId},#{d.deptId}) diff --git a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml index 4046ba7..c06c8c6 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/ImmunityMapper.xml @@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and datetime between #{params.beginDatetime} and #{params.endDatetime} and technical = #{technical} + ${params.dataScope} ORDER BY datetime DESC @@ -79,13 +80,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sw_immunity (sheep_id, usage_id, variety, sheep_type, gender, month_age, parity, breed,datetime, technical, comment, - update_by, update_time, create_by, create_time) + update_by, update_time, create_by, create_time,user_id,dept_id) values (#{d.sheepId}, #{d.usageId}, #{d.variety}, #{d.sheepType}, #{d.gender}, #{d.monthAge}, #{d.parity},#{d.breed}, #{d.datetime}, #{d.technical}, #{d.comment}, - #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime}) + #{d.updateBy}, #{d.updateTime}, #{d.createBy}, #{d.createTime},#{d.userId},#{d.deptId}) diff --git a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml index db299d2..d16f22d 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/QuarantineReportMapper.xml @@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and result = #{result} and status = #{status} and sqr.sheep_type=#{sheepType} + ${params.dataScope} ORDER BY datetime DESC @@ -112,7 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, create_by, - create_time + create_time, + user_id, + dept_id ) VALUES @@ -133,7 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.updateBy}, #{item.updateTime}, #{item.createBy}, - #{item.createTime} + #{item.createTime}, + #{item.userId}, + #{item.deptId} ) diff --git a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml index d155380..72d37e7 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/SwMedicineUsageMapper.xml @@ -111,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sm.name LIKE CONCAT('%', #{name}, '%') ) + ${params.dataScope} ORDER BY smu.datetime DESC @@ -162,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_by, create_time, + user_id, + dept_id, #{name}, @@ -173,6 +176,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createBy}, #{createTime}, + #{userId}, + #{deptId}, diff --git a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml index a8fb46e..9164a74 100644 --- a/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml +++ b/zhyc-module/src/main/resources/mapper/biosafety/TreatmentMapper.xml @@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and disease_id = #{diseaseId} and status = #{status} and veterinary = #{veterinary} + ${params.dataScope} ORDER BY datetime DESC @@ -121,6 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_by, create_time, + #{user_id}, + #{dept_id}, #{diagId}, @@ -144,6 +147,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createBy}, #{createTime}, + #{userId}, + #{deptId}, @@ -152,14 +157,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (diag_id, sheep_id, variety, sheep_type, month_age, gender, parity, breed, lact_day, gest_day, datetime, disease_id, disease_pid, veterinary, usage_id,status , - comment, update_by, update_time, create_by, create_time) + comment, update_by, update_time, create_by, create_time, user_id, dept_id) values (#{t.diagId}, #{t.sheepId}, #{t.variety}, #{t.sheepType}, #{t.monthAge}, #{t.gender}, #{t.parity}, #{t.breed}, #{t.lactDay}, #{t.gestDay}, #{t.datetime}, #{t.diseaseId}, #{t.diseasePid}, #{t.veterinary},#{t.usageId}, #{t.status}, #{t.comment}, - #{t.updateBy}, #{t.updateTime},#{t.createBy}, #{t.createTime}) + #{t.updateBy}, #{t.updateTime},#{t.createBy}, #{t.createTime},#{t.userId},#{t.deptId}) diff --git a/zhyc-module/src/main/resources/mapper/common/DeptMapper.xml b/zhyc-module/src/main/resources/mapper/common/DeptMapper.xml new file mode 100644 index 0000000..c999c2f --- /dev/null +++ b/zhyc-module/src/main/resources/mapper/common/DeptMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/zhyc-module/src/main/resources/mapper/common/UserMapper.xml b/zhyc-module/src/main/resources/mapper/common/UserMapper.xml index 8e289e2..f01c297 100644 --- a/zhyc-module/src/main/resources/mapper/common/UserMapper.xml +++ b/zhyc-module/src/main/resources/mapper/common/UserMapper.xml @@ -12,14 +12,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + SELECT DISTINCT u.user_id, u.nick_name, p.post_name, p.post_code + FROM sys_user u + JOIN sys_user_post up ON u.user_id = up.user_id + JOIN sys_post p ON up.post_id = p.post_id + WHERE p.post_code LIKE CONCAT('%', #{postCode}, '%') + AND u.status = 0 + AND u.del_flag = 0 + + + + WITH RECURSIVE dept_tree AS ( + SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} + UNION ALL + SELECT d.dept_id + FROM sys_dept d + INNER JOIN dept_tree dt ON d.parent_id = dt.dept_id + ) + SELECT DISTINCT u.user_id, u.nick_name, p.post_name, p.post_code + FROM dept_tree dt + JOIN sys_user u ON u.dept_id = dt.dept_id + JOIN sys_user_post up ON u.user_id = up.user_id + JOIN sys_post p ON up.post_id = p.post_id + WHERE p.post_code LIKE CONCAT('%', #{postCode}, '%') + AND u.status = 0 + AND u.del_flag = 0 + + + \ No newline at end of file