Commit 1e93eaac authored by tianyiming's avatar tianyiming

feat: bug修改

parent 5626ff75
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
</if> </if>
</if> </if>
<if test="type == 'supervision'"> <if test="type == 'supervision'">
AND (isn.receive_org_code = #{orgCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )) AND (isn.receive_org_code = #{companyCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
AND isn.instance_id <![CDATA[<>]]> '' AND isn.instance_id <![CDATA[<>]]> ''
</if> </if>
<if test="type == 'enterprise'"> <if test="type == 'enterprise'">
AND (isn.new_use_unit_credit_code = #{orgCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )) AND (isn.new_use_unit_credit_code = #{companyCode} or isn.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
</if> </if>
<if test="roleIds != null and type == 'supervision'"> <if test="roleIds != null and type == 'supervision'">
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'> <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
......
...@@ -680,7 +680,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -680,7 +680,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
String companyType = reginParams.getCompany().getCompanyType(); String companyType = reginParams.getCompany().getCompanyType();
String currentUserId = reginParams.getUserModel().getUserId(); String currentUserId = reginParams.getUserModel().getUserId();
SortVo sortMap = commonServiceImpl.sortFieldConversion(sort); SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, sortMap, model, type, orgCode, model.getRoleIds(), currentUserId, orgCode); Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, sortMap, model, type, companyCode, model.getRoleIds(), currentUserId, orgCode);
Page<JgChangeRegistrationUnitDto> noticeDtoPage = new Page<>(); Page<JgChangeRegistrationUnitDto> noticeDtoPage = new Page<>();
BeanUtils.copyProperties(noticePage, noticeDtoPage, "records"); BeanUtils.copyProperties(noticePage, noticeDtoPage, "records");
......
...@@ -215,7 +215,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -215,7 +215,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
List<Map<String, Object>> arrayList = new ArrayList<>(); List<Map<String, Object>> arrayList = new ArrayList<>();
equips.forEach(equip -> { equips.forEach(equip -> {
Map<String, Object> objectHashMap = new HashMap<>(); Map<String, Object> objectHashMap = new HashMap<>();
BeanUtil.beanToMap(equip, objectHashMap, false, false); BeanUtil.beanToMap(equip, objectHashMap, false, true);
objectHashMap.put("record", equip.getSEQUENCE_NBR()); objectHashMap.put("record", equip.getSEQUENCE_NBR());
objectHashMap.put("ADDRESS", concatDetailAddress(equip)); objectHashMap.put("ADDRESS", concatDetailAddress(equip));
arrayList.add(objectHashMap); arrayList.add(objectHashMap);
......
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