1、新增晨丰科技组织编辑限制、组织编辑管理员信息同步用户、用户管理更新手机号/昵称同步组织管理员信息、修改手机号同步组织管理员信息；2、未排单订单分组分页补充订单类型；3、装配清单顶级部件接口无数据修复；

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java

@@ -33,27 +33,40 @@ public class OrderRespVOCopy {
 
     @Schema(description = "订单状态")
     private Integer status;
+
+    @Schema(description = "订单类型")
+    private Integer orderType;
+
     @Schema(description = "自定义单号")
     private String defineId;
+
     @Schema(description = "客户")
     private String customer;
+
     @Schema(description = "地址")
     private String address;
+
     @Schema(description = "订单日期")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime orderDate;
+
     @Schema(description = "交付日期")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime deliveryDate;
+
     @Schema(description = "更新时间")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private Date updateTime;
+
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private Date createTime;
+
     @Schema(description = "片数")
     private int num;
+
     @Schema(description = "平方")
     private BigDecimal area = new BigDecimal("0");
+
     @Schema(description = "商品id")
     private String goodsId;
 
@@ -62,5 +75,4 @@ public class OrderRespVOCopy {
 
     @Schema(description = "子单列表")
     private List<OrderRespVOCopy> child;
-
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/ordercomponent/OrderComponentMapper.xml

@@ -34,19 +34,27 @@
     </select>
 
     <select id="getOrderTopComponentList" resultType="com.cf.imes.module.executor.dal.dataobject.ordercomponent.OrderComponentDO">
-        select distinct oc.id, oc.name
-        from order_component oc
-        join order_item oi on oc.id = oi.comp_id
-        and oi.order_id = oc.order_id
-        and oi.organ_id = oc.organ_id
-        where oc.order_id in
-        <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
-            #{orderId}
-        </foreach>
-        and oc.pid = 0
+        SELECT top.id, top.name
+        FROM order_component top
+        WHERE top.pid = 0
         <if test="name != null and name != ''">
             and oc.name like CONCAT('%', #{name}, '%')
         </if>
+        AND top.order_id in
+        <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+        AND EXISTS (
+        SELECT 1
+        FROM order_component oc
+        JOIN order_item oi
+        ON oi.comp_id = oc.id
+        AND oi.order_id = oc.order_id
+        AND oi.organ_id = oc.organ_id
+        WHERE oc.top_id = top.id
+        AND oc.order_id = top.order_id
+        AND oc.organ_id = top.organ_id
+        );
     </select>
 
     <select id="getComponentListOnTopLevel"

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml

@@ -14,7 +14,7 @@
         <result property="orderDate" column="orderDate"/>
         <result property="num" column="num"/>
         <result property="area" column="area"/>
-
+        <result property="orderType" column="orderType"/>
 
     </resultMap>
 
@@ -25,6 +25,7 @@
                 o.plate_num - o.planned_plate_num as num,
                 o.area - o.planned_plate_area as area,
                 o.parent_id as parentId,
+                o.order_type as orderType,
             </if>
             <if test="type != null and type == @com.cf.imes.module.executor.enums.OrderPlanQueryTypeEnum@GOODS_GROUP.getType()">
                 sum(og.plate_num - og.planned_plate_num) as num,