1.车用气瓶过滤监管机构bug

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

@@ -36,21 +36,21 @@
                 and tjvi.use_unit_credit_code = #{dto.useUnitCode}
             </if>
             <if test="dto.dataType == 'supervision' and client == 'jgAudit' ">
-                        AND tjvi.receive_company_code = #{dto.useUnitCreditCode}
+                AND tjvi.receive_company_code = #{dto.useUnitCreditCode}
                 AND  tjvi.status  <![CDATA[<>]]>  '使用单位待提交'
+               <if test="dto.orgBranchCode  != null and dto.orgBranchCode != ''">
+                   and  tjvi.org_branch_code = #{dto.orgBranchCode}
+               </if>
             </if>
-            <if test="dto.dataType == 'company' ">
+            <if test="dto.dataType == 'supervision' and client != 'jgAudit' ">
+                AND  tjvi.org_branch_code LIKE CONCAT(#{dto.orgBranchCode}, '%')
+            </if>
+            <if test="dto.dataType == 'company'">
                 and  tjvi.use_unit_credit_code = #{dto.useUnitCreditCode}
+                <if test="dto.orgBranchCode  != null and dto.orgBranchCode != ''">
+                    and  tjvi.org_branch_code = #{dto.orgBranchCode}
+                </if>
             </if>
-            <if test="dto.orgBranchCode  != null and dto.orgBranchCode != ''">
-                <choose>
-                    <when test="client == 'jgAudit'">
-                        and tjvi.org_branch_code = #{dto.orgBranchCode}
-                    </when>
-                    <otherwise>
-                        and tjvi.org_branch_code LIKE CONCAT(#{dto.orgBranchCode}, '%')
-                    </otherwise>
-                </choose>            </if>
         </where>
         order by
         <if test="sort != null">

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

@@ -144,7 +144,9 @@ public class JgVehicleInformationController extends BaseController {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
         } else {
             dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
-            dto.setOrgBranchCode(dto.getOrgBranchCode() != null ? dto.getOrgBranchCode() : info.getCompany().getOrgCode());
+            if(client.equals("jgLook")){
+                dto.setOrgBranchCode(dto.getOrgBranchCode() != null ? dto.getOrgBranchCode() : info.getCompany().getOrgCode());
+            }
         }
         Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto,sort, page, dto.getRoleIds(), client);
         list.getRecords().forEach(x -> {