Commit 1f17d7d5 authored by zhangsen's avatar zhangsen

安装告知、移装告知 列表查询修改

parent b2030ace
......@@ -35,6 +35,7 @@
LEFT JOIN idx_biz_jg_use_info ibjui on insEq.equ_id = ibjui.RECORD
<where>
isn.is_delete = false
AND (1=1 or isn.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
<if test="param != null ">
<if test="param.applyNo != null and param.applyNo != ''">
AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
......
......@@ -39,6 +39,7 @@
left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
<where>
tjtn.is_delete = false
AND (1=1 or tjtn.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
<if test="param != null ">
<if test="param.applyNo != null and param.applyNo != ''">
AND tjtn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
......
......@@ -339,7 +339,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
String orgCode;
orgCode = reginParams.getCompany().getCompanyCode();
model.setTransferToUserIds(reginParams.getUserModel().getUserId());
Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type, orgCode);
// 将Page<JgInstallationNotice>转化为Page<JgInstallationNoticeDto>
......
......@@ -374,6 +374,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
String orgCode;
orgCode = reginParams.getCompany().getCompanyCode();
model.setReceiveOrgCode(orgCode);
model.setTransferToUserIds(reginParams.getUserModel().getUserId());
Page<JgTransferNotice> noticePage = jgTransferNoticeMapper.queryForPage(page, model, type, orgCode);
// 将Page<JgTransferNotice>转化为Page<JgTransferNoticeDto>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment