From 2f646ba797dfa1a5652d5ab321d6df67867394af Mon Sep 17 00:00:00 2001 From: HashMap Date: Tue, 3 Mar 2026 15:54:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?refactor(frozen-sale/all):=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为数据库中新增的`user_id` `dept_id` 提供结构支持 [重构依据](https://www.yuque.com/piaobo-igrka/xvqmhp/ofcoxh57lywwubgy?singleDoc#) BREAKING CHANGE: 可能产生隐性数据一致性问题 可能导致某些业务逻辑出现问题 --- .../frozen/controller/DdSaleController.java | 3 + .../com/zhyc/module/frozen/domain/DdSale.java | 122 ++---------------- .../service/impl/DdSaleServiceImpl.java | 2 + .../mapper/frozen/sale/DdSaleMapper.xml | 11 +- 4 files changed, 23 insertions(+), 115 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdSaleController.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdSaleController.java index b3605c3..6c7c1a7 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdSaleController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/controller/DdSaleController.java @@ -84,6 +84,9 @@ public class DdSaleController extends BaseController { @Log(title = "销售主单", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DdSale ddSale) { + // 适配数据分离 + ddSale.setDeptId(getDeptId()); + ddSale.setUserId(getUserId()); return toAjax(ddSaleService.insertDdSale(ddSale)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdSale.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdSale.java index dc112c6..8ba6c42 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdSale.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/domain/DdSale.java @@ -4,6 +4,10 @@ import java.math.BigDecimal; import java.util.List; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.zhyc.common.annotation.Excel; @@ -11,10 +15,12 @@ import com.zhyc.common.core.domain.BaseEntity; /** * 销售主单对象 dd_sl - * + * * @author HashMap * @date 2025-12-01 */ +@EqualsAndHashCode(callSuper = true) +@Data public class DdSale extends BaseEntity { private static final long serialVersionUID = 1L; @@ -59,119 +65,11 @@ public class DdSale extends BaseEntity @Excel(name = "技术员") private String tech; + private Long userId; + private Long deptId; + /** 销售明细信息 */ private List ddSaleItemList; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setSaleDate(Date saleDate) - { - this.saleDate = saleDate; - } - - public Date getSaleDate() - { - return saleDate; - } - - public void setCustName(String custName) - { - this.custName = custName; - } - - public String getCustName() - { - return custName; - } - - public void setCustPhone(String custPhone) - { - this.custPhone = custPhone; - } - - public String getCustPhone() - { - return custPhone; - } - - public void setCustAddr(String custAddr) - { - this.custAddr = custAddr; - } - - public String getCustAddr() - { - return custAddr; - } - - public void setSalesper(String salesper) - { - this.salesper = salesper; - } - - public String getSalesper() - { - return salesper; - } - - public void setQuaranNo(String quaranNo) - { - this.quaranNo = quaranNo; - } - - public String getQuaranNo() - { - return quaranNo; - } - - public void setApprNo(String apprNo) - { - this.apprNo = apprNo; - } - - public String getApprNo() - { - return apprNo; - } - - public void setPrice(BigDecimal price) - { - this.price = price; - } - - public BigDecimal getPrice() - { - return price; - } - - public void setTech(String tech) - { - this.tech = tech; - } - - public String getTech() - { - return tech; - } - - public List getDdSaleItemList() - { - return ddSaleItemList; - } - - public void setDdSaleItemList(List ddSaleItemList) - { - this.ddSaleItemList = ddSaleItemList; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdSaleServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdSaleServiceImpl.java index e10d949..10ca01d 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdSaleServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/frozen/service/impl/DdSaleServiceImpl.java @@ -3,6 +3,7 @@ package com.zhyc.module.frozen.service.impl; import java.util.HashSet; import java.util.List; +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.utils.DateUtils; import com.zhyc.module.frozen.domain.DdFe; import com.zhyc.module.frozen.domain.DdFs; @@ -58,6 +59,7 @@ public class DdSaleServiceImpl implements IDdSaleService { * @return 销售主单 */ @Override + @DataScope(deptAlias = "dd_sl_alias" , userAlias = "dd_sl_alias") public List selectDdSaleList(DdSale ddSale) { return ddSaleMapper.selectDdSaleList(ddSale); } diff --git a/zhyc-module/src/main/resources/mapper/frozen/sale/DdSaleMapper.xml b/zhyc-module/src/main/resources/mapper/frozen/sale/DdSaleMapper.xml index 4532ca4..74479e0 100644 --- a/zhyc-module/src/main/resources/mapper/frozen/sale/DdSaleMapper.xml +++ b/zhyc-module/src/main/resources/mapper/frozen/sale/DdSaleMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, sale_date, cust_name, cust_phone, cust_addr, salesper, quaran_no, appr_no, price, tech, remark, create_by, create_time from dd_sl + select id, sale_date, cust_name, cust_phone, cust_addr, salesper, quaran_no, appr_no, price, tech, remark, create_by, create_time from dd_sl dd_sl_alias @@ -83,7 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, create_by, create_time, - + user_id, + dept_id, + #{saleDate}, #{custName}, @@ -97,7 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, #{createBy}, #{createTime}, - + #{userId}, + #{deptId}, + From 18f7808b6786bcf118f8e65c5e42c32a50dddde9 Mon Sep 17 00:00:00 2001 From: ll <1079863556@qq.com> Date: Tue, 3 Mar 2026 18:07:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BE=8A=E5=8F=AA=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhyc/module/base/controller/BasSheepController.java | 5 +++++ .../main/java/com/zhyc/module/base/domain/BasSheep.java | 7 +++++++ .../main/java/com/zhyc/module/base/domain/SheepFile.java | 6 ++++++ .../module/base/service/impl/SheepFileServiceImpl.java | 4 ++++ .../src/main/resources/mapper/base/BasSheepMapper.xml | 4 ++++ .../src/main/resources/mapper/base/SheepFileMapper.xml | 2 ++ 6 files changed, 28 insertions(+) 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 20fbe9a..d7ead21 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 @@ -84,6 +84,11 @@ public class BasSheepController extends BaseController { @Log(title = "羊只基本信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BasSheep basSheep) { + + // 新增下面这两行：从当前登录态中获取部门ID和用户ID，并赋值给即将保存的实体 + basSheep.setDeptId(getDeptId()); + basSheep.setUserId(getUserId()); + return toAjax(basSheepService.insertBasSheep(basSheep)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java index cc608df..4b30852 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java @@ -189,4 +189,11 @@ public class BasSheep extends BaseEntity private Long isDelete; + /** 用户编号 */ + private Long userId; + + /** 部门编号 */ + private Long deptId; + + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java index 9966094..c10717c 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java @@ -319,4 +319,10 @@ public class SheepFile extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd") private Date createTime; + + /** 用户编号 */ + private Long userId; + + /** 部门编号 */ + private Long deptId; } \ No newline at end of file diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java index 31299df..13a0f2b 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java @@ -1,5 +1,7 @@ package com.zhyc.module.base.service.impl; +// 新增这一行导入 +import com.zhyc.common.annotation.DataScope; import com.zhyc.module.base.domain.BreedRamFile; import com.zhyc.module.base.domain.SheepFile; import com.zhyc.module.base.mapper.SheepFileMapper; @@ -38,6 +40,7 @@ public class SheepFileServiceImpl implements ISheepFileService { /** * 查询羊只档案列表 */ + @DataScope(deptAlias = "sf", userAlias = "sf") @Override public List selectSheepFileList(SheepFile sheepFile) { return sheepFileMapper.selectSheepFileList(sheepFile); @@ -100,6 +103,7 @@ public class SheepFileServiceImpl implements ISheepFileService { * 必须调用 Mapper 中对应的 XML 方法 (selectSheepFileListByCondition) * 并且传递 sheepFile 对象以启用 列表查询 */ + @DataScope(deptAlias = "sf", userAlias = "sf") @Override public List selectSheepFileListByCondition(Map params, SheepFile sheepFile) { // 1. 验证并处理自定义参数 (驼峰转下划线、安全检查) diff --git a/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml index a2660f4..85a7670 100644 --- a/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml @@ -251,6 +251,8 @@ create_by, create_time, is_delete, + user_id, + dept_id, #{manageTags}, @@ -292,6 +294,8 @@ #{createBy}, #{createTime}, #{isDelete}, + #{userId}, + #{deptId}, diff --git a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml index c897edb..cc518da 100644 --- a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml @@ -90,6 +90,7 @@ and gender = #{gender} and status_id = #{statusId} and breed = #{breed} + ${params.dataScope} ORDER BY id ASC @@ -268,6 +269,7 @@ + ${params.dataScope} ORDER BY id ASC From 48d82ce7c0818259b70aed1c351230253c59087b Mon Sep 17 00:00:00 2001 From: ll <1079863556@qq.com> Date: Wed, 4 Mar 2026 11:19:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=BE=8A=E8=88=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DaSheepfoldController.java | 4 ++++ .../zhyc/module/base/domain/DaSheepfold.java | 22 +++++++++++++++++++ .../service/impl/DaSheepfoldServiceImpl.java | 3 +++ .../mapper/base/DaSheepfoldMapper.xml | 6 +++++ 4 files changed, 35 insertions(+) diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java index de91c69..01463d0 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java @@ -166,6 +166,10 @@ public class DaSheepfoldController extends BaseController @PostMapping public AjaxResult add(@RequestBody DaSheepfold daSheepfold) { + // 👇 新增这两行赋值语句 + daSheepfold.setDeptId(getDeptId()); + daSheepfold.setUserId(getUserId()); + return toAjax(daSheepfoldService.insertDaSheepfold(daSheepfold)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java index 8d48269..a5a0a27 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java @@ -121,4 +121,26 @@ public class DaSheepfold extends BaseEntity private Integer totalSheepCount; + // 👇 新增数据隔离字段 + /** 用户编号 */ + private Long userId; + + /** 部门编号 */ + private Long deptId; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java index 389cacf..1ab33d5 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java @@ -1,5 +1,6 @@ package com.zhyc.module.base.service.impl; +import com.zhyc.common.annotation.DataScope; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhyc.module.base.domain.BasSheep; import com.zhyc.module.base.domain.DaSheepfold; @@ -50,6 +51,7 @@ public class DaSheepfoldServiceImpl implements IDaSheepfoldService * @param daSheepfold 羊舍管理 * @return 羊舍管理 */ + @DataScope(deptAlias = "ds", userAlias = "ds") @Override public List selectDaSheepfoldList(DaSheepfold daSheepfold) { @@ -60,6 +62,7 @@ public class DaSheepfoldServiceImpl implements IDaSheepfoldService /** * 羊舍级别汇总查询（主表格） */ + @DataScope(deptAlias = "ds", userAlias = "ds") public List selectDaSheepfoldSummaryList(DaSheepfold daSheepfold) { return daSheepfoldMapper.selectDaSheepfoldSummaryList(daSheepfold); } diff --git a/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml b/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml index 902e4af..cdb7017 100644 --- a/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml @@ -62,6 +62,7 @@ and ds.ranch_id = #{ranchId} and ds.sheepfold_type_id = #{sheepfoldTypeId} + ${params.dataScope} -- 按羊舍维度分组（牧场+羊舍类型+羊舍编号 唯一标识一个羊舍） GROUP BY ds.ranch_id, ds.sheepfold_type_id, ds.sheepfold_no @@ -92,6 +93,7 @@ and ds.ranch_id = #{ranchId} and ds.sheepfold_type_id = #{sheepfoldTypeId} and ds.sheepfold_no = #{sheepfoldNo} + ${params.dataScope} GROUP BY ds.id,ds.ranch_id,ds.sheepfold_name,ds.sheepfold_type_id,ds.sheepfold_no,ds.row_no,ds.columns,ds.comment ORDER BY SUBSTRING_INDEX(ds.row_no, '-', 1), CAST(ds.columns AS UNSIGNED) @@ -112,6 +114,8 @@ row_no, columns, comment, + user_id, + dept_id, #{ranchId}, @@ -121,6 +125,8 @@ #{rowNo}, #{columns}, #{comment}, + #{userId}, + #{deptId}, From 5abf1cbff4041c97326456dcd2d6a11e572880da Mon Sep 17 00:00:00 2001 From: ll <1079863556@qq.com> Date: Wed, 4 Mar 2026 11:29:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=86=E7=BB=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasSheepGroupController.java | 4 ++++ .../module/base/domain/BasSheepGroup.java | 20 +++++++++++++++++++ .../impl/BasSheepGroupServiceImpl.java | 3 +++ .../mapper/base/BasSheepGroupMapper.xml | 6 ++++++ 4 files changed, 33 insertions(+) diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java index f681ab3..a12c2b9 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepGroupController.java @@ -69,6 +69,10 @@ public class BasSheepGroupController extends BaseController @PostMapping public AjaxResult add(@RequestBody BasSheepGroup basSheepGroup) { + // 👇 新增这两行赋值语句 + basSheepGroup.setDeptId(getDeptId()); + basSheepGroup.setUserId(getUserId()); + return toAjax(basSheepGroupService.insertBasSheepGroup(basSheepGroup)); } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java index 51a1b67..7a43514 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheepGroup.java @@ -42,4 +42,24 @@ public class BasSheepGroup extends TreeEntity private Integer isLeaf; + // 新增数据隔离字段 + /** 用户编号 */ + private Long userId; + + /** 部门编号 */ + private Long deptId; + + public Long getUserId() { + return userId; + } + public void setUserId(Long userId) { + this.userId = userId; + } + public Long getDeptId() { + return deptId; + } + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + } diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java index d67a55b..8778010 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/BasSheepGroupServiceImpl.java @@ -1,5 +1,6 @@ package com.zhyc.module.base.service.impl; +import com.zhyc.common.annotation.DataScope; import com.zhyc.common.exception.ServiceException; import com.zhyc.common.utils.DateUtils; import com.zhyc.module.base.domain.BasSheepGroup; @@ -45,6 +46,7 @@ public class BasSheepGroupServiceImpl implements IBasSheepGroupService // { // return basSheepGroupMapper.selectBasSheepGroupList(basSheepGroup); // } + @DataScope(deptAlias = "g", userAlias = "g") @Override public List selectBasSheepGroupList(BasSheepGroup basSheepGroup) { List groups = basSheepGroupMapper.selectBasSheepGroupList(basSheepGroup); @@ -122,6 +124,7 @@ public class BasSheepGroupServiceImpl implements IBasSheepGroupService return basSheepGroupMapper.deleteBasSheepGroupByGroupId(groupId); } + @DataScope(deptAlias = "g", userAlias = "g") @Override public List selectLeafNodes() { List leafNodes = basSheepGroupMapper.selectLeafNodes(); diff --git a/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMapper.xml index bb0ff09..e4366b3 100644 --- a/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/BasSheepGroupMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and group_name like concat('%', #{groupName}, '%') and status = #{status} + ${params.dataScope} ORDER BY g.group_id @@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE child.parent_id = g.group_id) > 0 THEN 0 ELSE 1 END) AS is_leaf FROM bas_sheep_group g WHERE g.status = '0' + ${params.dataScope} HAVING is_leaf = 1 @@ -87,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, + user_id, + dept_id, #{parentId}, @@ -97,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, + #{userId}, + #{deptId}, From b8b15604b320a521665d746a09a44428c0a79d64 Mon Sep 17 00:00:00 2001 From: ll <1079863556@qq.com> Date: Wed, 4 Mar 2026 11:48:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=BE=8A=E7=BE=A4=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SheepFileServiceImpl.java | 5 ++ .../resources/mapper/base/SheepFileMapper.xml | 49 ++++++++++++------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java index 13a0f2b..960e54f 100644 --- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java +++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java @@ -59,26 +59,31 @@ public class SheepFileServiceImpl implements ISheepFileService { return sheepFileMapper.selectSheepByManageTags(tags); } + @DataScope(deptAlias = "sf", userAlias = "sf") @Override public List> countBySheepType() { return sheepFileMapper.countBySheepType(); } + @DataScope(deptAlias = "sf", userAlias = "sf") @Override public List> countByBreedStatus() { return sheepFileMapper.countByBreedStatus(); } + @DataScope(deptAlias = "sf", userAlias = "sf") @Override public List> countByVariety() { return sheepFileMapper.countByVariety(); } + @DataScope(deptAlias = "sf", userAlias = "sf") @Override public List> countParityOfLactation() { return sheepFileMapper.countParityOfLactation(); } + @DataScope(deptAlias = "sf", userAlias = "sf") @Override public Long countInGroup() { return sheepFileMapper.countInGroup(); } diff --git a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml index cc518da..8c2aa3d 100644 --- a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml +++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml @@ -117,36 +117,49 @@