1.修改bug

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

@@ -24,5 +24,5 @@ public interface JgChangeRegistrationNameMapper extends BaseMapper<JgChangeRegis
 
     void deleteHistoryInfoById(@Param("code") String code);
 
-    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationNameDto dto, @Param("roleIds") List<String> roleIds, @Param("orgCode") String orgCode);
+    Page<Map<String, Object>> getListPage(@Param("page") Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationNameDto dto, @Param("roleIds") List<String> roleIds, @Param("companyCode") String companyCode);
 }

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

@@ -56,7 +56,7 @@
             </foreach>
         </if>
         <if test="dto.type == 'supervision'">
-            AND ur.receive_org_code = #{orgCode}
+            AND ur.receive_org_code = #{companyCode}
         </if>
         <if test="dto.type == 'company'">
             and ur.use_unit_credit_code = #{dto.useUnitCreditCode}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationNameController.java

@@ -118,7 +118,7 @@ public class JgChangeRegistrationNameController extends BaseController {
         } else {
             dto.setType(COMPANY_TYPE_SUPERVISION);
         }
-        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getList(dto, page, dto.getRoleIds(),reginParams.getCompany().getOrgCode()));
+        return ResponseHelper.buildResponse(jgChangeRegistrationNameService.getList(dto, page, dto.getRoleIds(),reginParams.getCompany().getCompanyCode()));
     }
 
 

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

@@ -600,13 +600,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         return map;
     }
 
-    public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds, String orgCode) {
+    public Page<Map<String, Object>> getList(JgChangeRegistrationNameDto dto, Page<Map<String, Object>> page, List<String> roleIds, String companyCode) {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(dto.getReceiveOrgCode())) {
             String[] receiveOrgIdList = dto.getReceiveOrgCode().split("_");
             if (receiveOrgIdList.length > 1) {
                 dto.setReceiveOrgCode(receiveOrgIdList[0]);
             }
         }
-        return this.baseMapper.getListPage(page, dto, roleIds, orgCode);
+        return this.baseMapper.getListPage(page, dto, roleIds, companyCode);
     }
 }
\ No newline at end of file

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

@@ -267,8 +267,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("approvalStatus", op);
                 if (!ObjectUtils.isEmpty(noticeDto.getInstanceStatus()) &&
-                        (noticeDto.getAuditStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject()) ||
-                                noticeDto.getAuditStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack()))) {
+                        (noticeDto.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject()) ||
+                                noticeDto.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack()))) {
                     map.put("approvalStatus", "提交");
                 }
                 task.setVariable(map);