修改单位变更列表

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationUnitMapper.java

@@ -28,7 +28,7 @@ public interface JgChangeRegistrationUnitMapper extends CustomBaseMapper<JgChang
      * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 安装告知列表
      */
-    Page<JgChangeRegistrationUnit> queryForPage(Page<JgChangeRegistrationUnit> page, @Param("param") JgChangeRegistrationUnitDto model, @Param("type") String type, @Param("orgCode") String orgCode , @Param("roleIds") List<String> roleIds);
+    Page<JgChangeRegistrationUnit> queryForPage(Page<JgChangeRegistrationUnit> page, @Param("param") JgChangeRegistrationUnitDto model, @Param("type") String type, @Param("orgCode") String orgCode , @Param("roleIds") List<String> roleIds , @Param("currentUserId") String currentUserId);
 
     /**
      * 根据安装告知编号查询设备、设计、制造等信息

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationUnitMapper.xml

@@ -57,6 +57,7 @@
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
+            and (1=1 or ur.transfer_to_user_ids like concat('%',#{currentUserId},'%'))
         </where>
         ORDER BY
         isn.create_date DESC,  isn.apply_no DESC

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -315,8 +315,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         String orgCode;
         orgCode = reginParams.getCompany().getCompanyCode();
-
-        Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, model, type, orgCode, model.getRoleIds());
+        String currentUserId = reginParams.getUserModel().getUserId();
+        Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, model, type, orgCode, model.getRoleIds(),currentUserId);
 
         Page<JgChangeRegistrationUnitDto> noticeDtoPage = new Page<>();
         BeanUtils.copyProperties(noticePage, noticeDtoPage, "records");