Commit f3848464 authored by 韩桐桐's avatar 韩桐桐

fix(注销报废):列表数据返回暂存数据

parent ae3306f3
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'> <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
ur.instance_status like concat('%',#{role},'%') ur.instance_status like concat('%',#{role},'%')
</foreach> </foreach>
or ur.create_user_id = #{dto.createUserId}
</if> </if>
<if test="dto.type == 'supervision'"> <if test="dto.type == 'supervision'">
AND ur.receive_org_code = #{orgCode} AND ur.receive_org_code = #{orgCode}
......
...@@ -108,6 +108,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -108,6 +108,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
public Page<Map<String, Object>> getList(JgScrapCancelDto dto, Page<Map<String, Object>> page, List<String> roleIds) { public Page<Map<String, Object>> getList(JgScrapCancelDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
ReginParams reginParams = this.getSelectedOrgInfo(); ReginParams reginParams = this.getSelectedOrgInfo();
String orgCode = reginParams.getCompany().getCompanyCode(); String orgCode = reginParams.getCompany().getCompanyCode();
dto.setCreateUserId(reginParams.getUserModel().getUserId());
Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode); Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode);
listPage.getRecords().forEach(item -> { listPage.getRecords().forEach(item -> {
if (item.containsKey("auditStatus") && Objects.nonNull(item.get("auditStatus"))) { if (item.containsKey("auditStatus") && Objects.nonNull(item.get("auditStatus"))) {
......
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