电梯注销业务开发bug修改

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

@@ -55,14 +55,18 @@
 <!--            <if test="dto.useUnitName != null and dto.useUnitName != ''">-->
 <!--                and  use.USE_UNIT_NAME like concat('%',#{dto.useUnitName},'%')-->
 <!--            </if>-->
+<!--             -->
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
-                    ur.audit_status like concat('%',#{role},'%')
+                    ur.instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
             <if test="dto.type == 'supervision'">
                 AND ur.receive_org_code = #{orgCode}
             </if>
+            <if test="dto.type == 'enterprise' ">
+                and ur.use_unit_code = #{orgCode}
+            </if>
 <!--            <if test="dto.type == 'enterprise'">-->
 <!--                AND use.USE_UNIT_CREDIT_CODE = #{orgCode}-->
 <!--            </if>-->

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/JgScrapCancelServiceImpl.java

@@ -386,9 +386,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             if (submit) {
                 // 查询下节点任务
                 getNext(roleListSecond, jgScrapCancel.getInstanceId(), taskName);
+
+                String join = String.join(",", roleListSecond);
                 jgScrapCancel.setStatus(taskName[0]);
                 if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
-                    jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + roleListSecond);
+                    jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + join);
                 } else {
                     jgScrapCancel.setInstanceStatus(String.join(",", roleListSecond));
                 }