列表数据展示异常问题处理

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

@@ -51,10 +51,10 @@
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>
-            <if test="dto.dataType == 'supervision' ">
+            <if test="dto.dataType != null and dto.dataType == 'supervision' ">
                 and  ur.receive_org_code = #{dto.receiveOrgCode}
             </if>
-            <if test="dto.dataType == 'company' ">
+            <if test="dto.dataType != null and dto.dataType == 'company' ">
                 and  ur.use_unit_credit_code = #{dto.useUnitCreditCode}
             </if>
         </where>

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

@@ -98,7 +98,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 		ReginParams reginParams = getSelectedOrgInfo();
 		if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
 			dto.setDataType(COMPANY_TYPE_COMPANY);
-			dto.setUnitCode(reginParams.getCompany().getCompanyCode());
+			dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
 		} else {
 			dto.setDataType(COMPANY_TYPE_SUPERVISION);
 			dto.setReceiveOrgCode(reginParams.getCompany().getCompanyCode());