123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleExtensionBiz.java

@@ -72,12 +72,12 @@ public class VehicleExtensionBiz extends BaseBiz<VehicleEextensionMapper, Vehicl
     }
 
 
-    public List<VehicleExtensionVO>  selectList(String vehicleId){
-        return mapper.selectList(vehicleId);
+    public List<VehicleExtensionVO>  selectList(String vehicleId,Integer parentCataId){
+        return mapper.selectList(vehicleId,parentCataId);
     }
 
-    public List<VehicleExtensionVO>  selectListByApply(List<Integer> cataIds){
-        return  mapper.selectListByApply(cataIds);
+    public List<VehicleExtensionVO>  selectListByApply(List<Integer> cataIds,Integer parentCataId){
+        return  mapper.selectListByApply(cataIds,parentCataId);
     }
 
 
@@ -85,7 +85,7 @@ public class VehicleExtensionBiz extends BaseBiz<VehicleEextensionMapper, Vehicl
         List<VehicleExtensionVO> vehicleExtensionVOS = mapper.selectListByParent(vehicleId);
         if (vehicleExtensionVOS.size() > 0){
             for (VehicleExtensionVO extensionVO:vehicleExtensionVOS) {
-                extensionVO.setChildren(selectList(vehicleId));
+                extensionVO.setChildren(selectList(vehicleId,extensionVO.getParentCataId()));
             }
         }
         return  vehicleExtensionVOS;
@@ -97,7 +97,7 @@ public class VehicleExtensionBiz extends BaseBiz<VehicleEextensionMapper, Vehicl
         List<VehicleExtensionVO> vehicleExtensionVOS = mapper.selectListByApplyParent(cataIds);
         if (vehicleExtensionVOS.size() > 0){
             for (VehicleExtensionVO extensionVO:vehicleExtensionVOS) {
-                extensionVO.setChildren(selectListByApply(cataIds));
+                extensionVO.setChildren(selectListByApply(cataIds,extensionVO.getParentCataId()));
             }
         }
         return  vehicleExtensionVOS;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleEextensionMapper.java

@@ -16,9 +16,9 @@ public interface VehicleEextensionMapper extends Mapper<VehicleExtension>, Selec
 
     void  delByIds(@Param("ids") List<Integer> ids,@Param("vehicleId")String vehicleId);
 
-    List<VehicleExtensionVO>  selectList(@Param("vehicleId")String vehicleId);
+    List<VehicleExtensionVO>  selectList(@Param("vehicleId")String vehicleId,@Param("parentCataId")Integer parentCataId);
 
-    List<VehicleExtensionVO>  selectListByApply(@Param("cataIds")List<Integer> cataIds);
+    List<VehicleExtensionVO>  selectListByApply(@Param("cataIds")List<Integer> cataIds,@Param("parentCataId")Integer parentCataId);
 
 
     List<VehicleExtensionVO>  selectListByParent(@Param("vehicleId")String vehicleId);

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleExtensionMapper.xml

@@ -27,6 +27,9 @@
         LEFT JOIN vehicle_plat_cata c1  ON e.cata_id=c1.id
         <where>
             e.is_del =0  and e.vehicle_id =#{vehicleId}
+            <if test="parentCataId != null">
+                and  e.parent_cata_id=#{parentCataId}
+            </if>
         </where>
         ORDER BY e.parent_cata_id
     </select>
@@ -58,6 +61,9 @@
         <foreach collection="cataIds" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
+        <if test="parentCataId != null">
+            and  c.parent_id=#{parentCataId}
+        </if>
         ORDER BY c1.id
     </select>