aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-21 07:20:20 +08:00
parent 093f80bc79
commit b471737bb0
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -236,6 +236,14 @@ public class EmisWaybillController extends BaseController
@RequestMapping("/list") @RequestMapping("/list")
public TableDataInfo list(EmisWaybill emisWaybill) public TableDataInfo list(EmisWaybill emisWaybill)
{ {
// 非总部只能查看自己的或者与自己相关的订单
if(!getLoginUser().getUser().isTopSite()){
emisWaybill.getParams().put("innerQuery","1");
emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode());
emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
}
startPage(); startPage();
List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);

15
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -285,6 +285,8 @@
<select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult"> <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
<include refid="selectEmisWaybillVo"/> <include refid="selectEmisWaybillVo"/>
<where> <where>
del_flag='0'
<if test="id != null "> and id = #{id}</if> <if test="id != null "> and id = #{id}</if>
<if test="orderSn != null and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if> <if test="orderSn != null and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
<if test="custOrderId != null and custOrderId != ''"> and cust_order_id like concat('%', #{custOrderId}, '%')</if> <if test="custOrderId != null and custOrderId != ''"> and cust_order_id like concat('%', #{custOrderId}, '%')</if>
@ -447,8 +449,8 @@
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if> <if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if> <if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if> <if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if> <if test="createSite != null and createSite != ''"> and create_site=#{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if> <if test="updateSite != null and updateSite != ''"> and update_site=#{updateSite}</if>
<if test="params.beginSendDate != null and params.beginSendDate != ''"> <if test="params.beginSendDate != null and params.beginSendDate != ''">
and send_date <![CDATA[ >= ]]> #{params.beginSendDate} and send_date <![CDATA[ >= ]]> #{params.beginSendDate}
@ -461,6 +463,15 @@
and bl_print=#{params.printFlag} and bl_print=#{params.printFlag}
</if> </if>
<if test="params.innerQuery != null and params.innerQuery == '1'">
and (
create_site=#{params.currentSiteCode}
or salesmen=#{params.currentEmpName}
or payee=#{params.currentEmpName}
)
</if>
</where> </where>
order by create_time desc order by create_time desc