Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/Banner.java

@@ -110,7 +110,7 @@ public class Banner {
     private Integer  type;
 
     /**
-     * 位置 banner位置0 所有 1：推荐 2：拍拍 3：短视频 4：问答
+     * 位置 banner位置0：所有 1：首页 2：房车主页 3：机车主页 4：游艇主页
      */
     private Integer location;
 

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

@@ -161,6 +161,9 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         List<VehiclePlatCata> vehiclePlatCatas = childrens.parallelStream().filter(vehiclePlatCata -> {
             vehiclePlatCata.setParentId(parentId);
             vehiclePlatCata.setCrtTime(System.currentTimeMillis());
+            if(null == vehiclePlatCata.getRank()) {
+                vehiclePlatCata.setRank(1);
+            }
             return vehiclePlatCata.getState() == 0;
         }).filter(vpc -> StringUtils.isNotBlank(vpc.getName())).collect(Collectors.toList());
 

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

@@ -7,14 +7,14 @@
 
     <insert id="addPlatCataList" parameterType="java.util.List">
         insert into vehicle_plat_cata (
-        parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,isMore,start_using
+        parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,is_more,start_using
         ) VALUES
         <foreach collection ="vpclist" item="vpc" index="index" separator =",">
-        <if test="vpc.state == 0" >
-            (#{vpc.parentId},#{vpc.name},#{vpc.icon},#{vpc.depict}
-            ,#{vpc.rank},#{vpc.level},#{vpc.state},#{vpc.crtTime}
-            ,#{vpc.updTime},#{vpc.isMore},#{vpc.startUsing})
-        </if>
+            <if test="vpc.state == 0" >
+                (#{vpc.parentId},#{vpc.name},#{vpc.icon},#{vpc.depict}
+                ,#{vpc.rank},#{vpc.level},#{vpc.state},#{vpc.crtTime}
+                ,#{vpc.updTime},#{vpc.isMore},#{vpc.startUsing})
+            </if>
         </foreach>
     </insert>