diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java index 7bc675f..121aa32 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java @@ -53,6 +53,7 @@ public class CarrierIssuedManager { tdCarrierIssued.setCreateBy(ShiroUtils.getSysUser().getLoginName()); tdCarrierIssued.setCreateTime(new Date()); } + tdCarrierIssued.setDeptId(ShiroUtils.getSysUser().getDeptId()); return carrierIssuedService.saveOrUpdate(tdCarrierIssued); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java index 91f3e82..2933390 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java @@ -28,6 +28,7 @@ public class CarrierManager { private TdCarrierService carrierService; + public List selectTdCarrierList(TdCarrier tdCarrier) { return carrierService.selectTdCarrierList(tdCarrier); } @@ -41,10 +42,12 @@ public class CarrierManager { if (CharSequenceUtil.isNotBlank(tdCarrier.getId())) { tdCarrier.setUpdateBy(ShiroUtils.getSysUser().getLoginName()); tdCarrier.setUpdateTime(new Date()); + } else { tdCarrier.setCreateBy(ShiroUtils.getSysUser().getLoginName()); tdCarrier.setCreateTime(new Date()); } + tdCarrier.setDeptId(ShiroUtils.getSysUser().getDeptId()); return carrierService.saveOrUpdate(tdCarrier); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java index 9877f31..dcdbce4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java @@ -211,6 +211,12 @@ public class TdCarrier extends BaseEntity { private String destoryStand; + /** + * 部门 + */ + private Long deptId; + + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrierIssued.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrierIssued.java index 1c772ea..4c7e583 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrierIssued.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrierIssued.java @@ -180,6 +180,12 @@ public class TdCarrierIssued extends BaseEntity { private String issuedDept; + /** + * 部门 + */ + private Long deptId; + + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java index c2652d6..a39f4c6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service.carrier.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.system.domain.carrier.TdCarrierIssued; import com.ruoyi.system.mapper.carrier.TdCarrierIssuedMapper; import com.ruoyi.system.mapper.carrier.TdCarrierMapper; @@ -21,21 +22,26 @@ public class TdCarrierIssuedServiceImpl extends ServiceImpl selectTdCarrierList(TdCarrierIssued tdCarrierIssued) { return tdCarrierIssuedMapper.selectTdCarrierList(tdCarrierIssued); } + @DataScope(deptAlias = "d") @Override public List selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued) { return tdCarrierIssuedMapper.selectTdCarrierUpdateList(tdCarrierIssued); } + @DataScope(deptAlias = "d") @Override public List selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued) { return tdCarrierIssuedMapper.selectTdCarrierUserList(tdCarrierIssued); } + @DataScope(deptAlias = "d") @Override public List selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued) { return tdCarrierIssuedMapper.selectTdCarrierSaveList(tdCarrierIssued); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java index 0961d0f..a9d934d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service.carrier.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.system.domain.carrier.TdCarrier; import com.ruoyi.system.mapper.carrier.TdCarrierMapper; import com.ruoyi.system.mapper.place.TdPlaceMapper; @@ -22,11 +23,14 @@ public class TdCarrierServiceImpl extends ServiceImpl selectTdCarrierList(TdCarrier tdCarrier) { return carrierMapper.selectTdCarrierList(tdCarrier); } + @DataScope(deptAlias = "d") @Override public List selectTdCarrierUpdateList(TdCarrier tdCarrier) { return carrierMapper.selectTdCarrierUpdateList(tdCarrier); diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml index 912cb65..64f88af 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml @@ -40,6 +40,7 @@ + @@ -54,10 +55,10 @@ update_time,remark,carrier_name, area_city,area_district,maintain_stand, destory_stand,issued_dept,expiration_time, - mentSend_time,reclaim_time + mentSend_time,reclaim_time,dept_id @@ -121,7 +126,7 @@ - select from td_carrier + select from td_carrier d AND carrier_name LIKE concat('%',#{carrierName},'%') @@ -88,12 +89,14 @@ AND status = #{status} + + ${params.dataScope} ORDER BY create_time DESC