luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:载体部门权限

Browse Source
new-exam
wangxy 7 months ago
parent 36a30b7b22
commit 6d809f6a59
8 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierIssuedManager.java
Unescape View File

@ -53,6 +53,7 @@ public class CarrierIssuedManager {
tdCarrierIssued.setCreateBy(ShiroUtils.getSysUser().getLoginName()); tdCarrierIssued.setCreateBy(ShiroUtils.getSysUser().getLoginName());
tdCarrierIssued.setCreateTime(new Date()); tdCarrierIssued.setCreateTime(new Date());
} }
tdCarrierIssued.setDeptId(ShiroUtils.getSysUser().getDeptId());
return carrierIssuedService.saveOrUpdate(tdCarrierIssued); return carrierIssuedService.saveOrUpdate(tdCarrierIssued);
} }

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CarrierManager.java
Unescape View File

@ -28,6 +28,7 @@ public class CarrierManager {
private TdCarrierService carrierService; private TdCarrierService carrierService;
public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier) { public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier) {
return carrierService.selectTdCarrierList(tdCarrier); return carrierService.selectTdCarrierList(tdCarrier);
} }
@ -41,10 +42,12 @@ public class CarrierManager {
if (CharSequenceUtil.isNotBlank(tdCarrier.getId())) { if (CharSequenceUtil.isNotBlank(tdCarrier.getId())) {
tdCarrier.setUpdateBy(ShiroUtils.getSysUser().getLoginName()); tdCarrier.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
tdCarrier.setUpdateTime(new Date()); tdCarrier.setUpdateTime(new Date());
} else { } else {
tdCarrier.setCreateBy(ShiroUtils.getSysUser().getLoginName()); tdCarrier.setCreateBy(ShiroUtils.getSysUser().getLoginName());
tdCarrier.setCreateTime(new Date()); tdCarrier.setCreateTime(new Date());
} }
tdCarrier.setDeptId(ShiroUtils.getSysUser().getDeptId());
return carrierService.saveOrUpdate(tdCarrier); return carrierService.saveOrUpdate(tdCarrier);
} }

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java
Unescape View File

@ -211,6 +211,12 @@ public class TdCarrier extends BaseEntity {
private String destoryStand; private String destoryStand;
/**
* 部门
*/
private Long deptId;
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrierIssued.java
Unescape View File

@ -180,6 +180,12 @@ public class TdCarrierIssued extends BaseEntity {
private String issuedDept; private String issuedDept;
/**
* 部门
*/
private Long deptId;
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

6
ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.carrier.impl; package com.ruoyi.system.service.carrier.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.domain.carrier.TdCarrierIssued;
import com.ruoyi.system.mapper.carrier.TdCarrierIssuedMapper; import com.ruoyi.system.mapper.carrier.TdCarrierIssuedMapper;
import com.ruoyi.system.mapper.carrier.TdCarrierMapper; import com.ruoyi.system.mapper.carrier.TdCarrierMapper;
@ -21,21 +22,26 @@ public class TdCarrierIssuedServiceImpl extends ServiceImpl<TdCarrierIssuedMappe
@Resource @Resource
private TdCarrierIssuedMapper tdCarrierIssuedMapper; private TdCarrierIssuedMapper tdCarrierIssuedMapper;
@DataScope(deptAlias = "d")
@Override @Override
public List<TdCarrierIssued> selectTdCarrierList(TdCarrierIssued tdCarrierIssued) { public List<TdCarrierIssued> selectTdCarrierList(TdCarrierIssued tdCarrierIssued) {
return tdCarrierIssuedMapper.selectTdCarrierList(tdCarrierIssued); return tdCarrierIssuedMapper.selectTdCarrierList(tdCarrierIssued);
} }
@DataScope(deptAlias = "d")
@Override @Override
public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued) { public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued) {
return tdCarrierIssuedMapper.selectTdCarrierUpdateList(tdCarrierIssued); return tdCarrierIssuedMapper.selectTdCarrierUpdateList(tdCarrierIssued);
} }
@DataScope(deptAlias = "d")
@Override @Override
public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued) { public List<TdCarrierIssued> selectTdCarrierUserList(TdCarrierIssued tdCarrierIssued) {
return tdCarrierIssuedMapper.selectTdCarrierUserList(tdCarrierIssued); return tdCarrierIssuedMapper.selectTdCarrierUserList(tdCarrierIssued);
} }
@DataScope(deptAlias = "d")
@Override @Override
public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued) { public List<TdCarrierIssued> selectTdCarrierSaveList(TdCarrierIssued tdCarrierIssued) {
return tdCarrierIssuedMapper.selectTdCarrierSaveList(tdCarrierIssued); return tdCarrierIssuedMapper.selectTdCarrierSaveList(tdCarrierIssued);

4
ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.system.service.carrier.impl; package com.ruoyi.system.service.carrier.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.domain.carrier.TdCarrier;
import com.ruoyi.system.mapper.carrier.TdCarrierMapper; import com.ruoyi.system.mapper.carrier.TdCarrierMapper;
import com.ruoyi.system.mapper.place.TdPlaceMapper; import com.ruoyi.system.mapper.place.TdPlaceMapper;
@ -22,11 +23,14 @@ public class TdCarrierServiceImpl extends ServiceImpl<TdCarrierMapper, TdCarrier
@Resource @Resource
private TdCarrierMapper carrierMapper; private TdCarrierMapper carrierMapper;
@DataScope(deptAlias = "d")
@Override @Override
public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier) { public List<TdCarrier> selectTdCarrierList(TdCarrier tdCarrier) {
return carrierMapper.selectTdCarrierList(tdCarrier); return carrierMapper.selectTdCarrierList(tdCarrier);
} }
@DataScope(deptAlias = "d")
@Override @Override
public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier) { public List<TdCarrier> selectTdCarrierUpdateList(TdCarrier tdCarrier) {
return carrierMapper.selectTdCarrierUpdateList(tdCarrier); return carrierMapper.selectTdCarrierUpdateList(tdCarrier);

19
ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
Unescape View File

@ -40,6 +40,7 @@
<result property="expirationTime" column="expiration_time" jdbcType="VARCHAR"/> <result property="expirationTime" column="expiration_time" jdbcType="VARCHAR"/>
<result property="mentsendTime" column="mentSend_time" jdbcType="TIMESTAMP"/> <result property="mentsendTime" column="mentSend_time" jdbcType="TIMESTAMP"/>
<result property="reclaimTime" column="reclaim_time" jdbcType="TIMESTAMP"/> <result property="reclaimTime" column="reclaim_time" jdbcType="TIMESTAMP"/>
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@ -54,10 +55,10 @@
update_time,remark,carrier_name, update_time,remark,carrier_name,
area_city,area_district,maintain_stand, area_city,area_district,maintain_stand,
destory_stand,issued_dept,expiration_time, destory_stand,issued_dept,expiration_time,
mentSend_time,reclaim_time mentSend_time,reclaim_time,dept_id
</sql> </sql>
<select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued"> <select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
select <include refid="Base_Column_List"/> from td_carrier_issued select <include refid="Base_Column_List"/> from td_carrier_issued d
<trim prefix="where" prefixOverrides="and|or"> <trim prefix="where" prefixOverrides="and|or">
<if test="carrierName!=null and carrierName!=''"> <if test="carrierName!=null and carrierName!=''">
AND carrier_name LIKE concat('%',#{carrierName},'%') AND carrier_name LIKE concat('%',#{carrierName},'%')
@ -83,13 +84,15 @@
<if test="status!=null and status!=''"> <if test="status!=null and status!=''">
AND status = #{status} AND status = #{status}
</if> </if>
<!-- 数据范围过滤 -->
${params.dataScope}
</trim> </trim>
ORDER BY create_time DESC ORDER BY create_time DESC
</select> </select>
<select id="selectTdCarrierUserList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued"> <select id="selectTdCarrierUserList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
select <include refid="Base_Column_List"/> from td_carrier_issued select <include refid="Base_Column_List"/> from td_carrier_issued d
<trim prefix="where" prefixOverrides="and|or"> <trim prefix="where" prefixOverrides="and|or">
<if test="carrierName!=null and carrierName!=''"> <if test="carrierName!=null and carrierName!=''">
AND carrier_name LIKE concat('%',#{carrierName},'%') AND carrier_name LIKE concat('%',#{carrierName},'%')
@ -113,6 +116,8 @@
AND area_district = #{areaDistrict} AND area_district = #{areaDistrict}
</if> </if>
AND status in (1,2) AND status in (1,2)
<!-- 数据范围过滤 -->
${params.dataScope}
</trim> </trim>
ORDER BY create_time DESC ORDER BY create_time DESC
</select> </select>
@ -121,7 +126,7 @@
<select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued"> <select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
select <include refid="Base_Column_List"/> from td_carrier_issued select <include refid="Base_Column_List"/> from td_carrier_issued d
<trim prefix="where" prefixOverrides="and|or"> <trim prefix="where" prefixOverrides="and|or">
<if test="carrierName!=null and carrierName!=''"> <if test="carrierName!=null and carrierName!=''">
AND carrier_name LIKE concat('%',#{carrierName},'%') AND carrier_name LIKE concat('%',#{carrierName},'%')
@ -145,11 +150,13 @@
AND area_district = #{areaDistrict} AND area_district = #{areaDistrict}
</if> </if>
AND status !='6' AND status !='6'
<!-- 数据范围过滤 -->
${params.dataScope}
</trim> </trim>
ORDER BY create_time DESC ORDER BY create_time DESC
</select> </select>
<select id="selectTdCarrierSaveList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued"> <select id="selectTdCarrierSaveList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
select <include refid="Base_Column_List"/> from td_carrier_issued select <include refid="Base_Column_List"/> from td_carrier_issued d
<trim prefix="where" prefixOverrides="and|or"> <trim prefix="where" prefixOverrides="and|or">
<if test="carrierName!=null and carrierName!=''"> <if test="carrierName!=null and carrierName!=''">
AND carrier_name LIKE concat('%',#{carrierName},'%') AND carrier_name LIKE concat('%',#{carrierName},'%')
@ -173,6 +180,8 @@
AND area_district = #{areaDistrict} AND area_district = #{areaDistrict}
</if> </if>
AND status in (3,4) AND status in (3,4)
<!-- 数据范围过滤 -->
${params.dataScope}
</trim> </trim>
ORDER BY create_time DESC ORDER BY create_time DESC

11
ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
Unescape View File

@ -45,6 +45,7 @@
<result property="areaDistrict" column="area_district" jdbcType="VARCHAR"/> <result property="areaDistrict" column="area_district" jdbcType="VARCHAR"/>
<result property="maintainStand" column="maintain_stand" jdbcType="VARCHAR"/> <result property="maintainStand" column="maintain_stand" jdbcType="VARCHAR"/>
<result property="destoryStand" column="destory_stand" jdbcType="VARCHAR"/> <result property="destoryStand" column="destory_stand" jdbcType="VARCHAR"/>
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@ -59,10 +60,10 @@
maintain_date,destory_depart,destory_user, maintain_date,destory_depart,destory_user,
destory_date,destory_manner,status, destory_date,destory_manner,status,
create_by,create_time,update_by, create_by,create_time,update_by,
update_time,remark,carrier_name,area_city,area_district,maintain_stand,destory_stand update_time,remark,carrier_name,area_city,area_district,maintain_stand,destory_stand,dept_id
</sql> </sql>
<select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrier"> <select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrier">
select <include refid="Base_Column_List"/> from td_carrier select <include refid="Base_Column_List"/> from td_carrier d
<trim prefix="where" prefixOverrides="and|or"> <trim prefix="where" prefixOverrides="and|or">
<if test="carrierName!=null and carrierName!=''"> <if test="carrierName!=null and carrierName!=''">
AND carrier_name LIKE concat('%',#{carrierName},'%') AND carrier_name LIKE concat('%',#{carrierName},'%')
@ -88,12 +89,14 @@
<if test="status!=null and status!=''"> <if test="status!=null and status!=''">
AND status = #{status} AND status = #{status}
</if> </if>
<!-- 数据范围过滤 -->
${params.dataScope}
</trim> </trim>
ORDER BY create_time DESC ORDER BY create_time DESC
</select> </select>
<select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrier"> <select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrier">
select <include refid="Base_Column_List"/> from td_carrier select <include refid="Base_Column_List"/> from td_carrier d
<trim prefix="where" prefixOverrides="and|or"> <trim prefix="where" prefixOverrides="and|or">
<if test="carrierName!=null and carrierName!=''"> <if test="carrierName!=null and carrierName!=''">
AND carrier_name LIKE concat('%',#{carrierName},'%') AND carrier_name LIKE concat('%',#{carrierName},'%')
@ -119,6 +122,8 @@
<if test="status!=null and status!=''"> <if test="status!=null and status!=''">
AND status !='7' AND status !='7'
</if> </if>
<!-- 数据范围过滤 -->
${params.dataScope}
</trim> </trim>
ORDER BY create_time DESC ORDER BY create_time DESC
</select> </select>

Write Preview
Loading…
Cancel
Save