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