Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -207,7 +207,7 @@
         <result column="discount" property="discount"/>
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="flg_handle_setting" property="flgHandleSetting"/>
-
+        <result column="channelName" property="channelName"/>
         <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
 
     </resultMap>
@@ -1029,7 +1029,7 @@
         <include refid="Base_Column_List_Detail_Join"/>,
         tmc.cus_code,tmc.cus_name, tmc.cus_phone, tmc.address_area, tmc.address_name, tmc.address_no,
         tmc.address_gcj02, tmc.address_full, tmc.contact_name, tmc.contact_phone, tmc.cus_from, tmc.channel_id,
-
+        tmsc.channel_name as "channelName",
 
         <include refid="Base_Column_List_Item_Response_Detail_Join"/>
         FROM dkic_b.t_psi_order as t
@@ -1038,6 +1038,7 @@
         inner join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id  = toi.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id  = tmgs.brand_id
         left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
+        left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
         left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
         left join(SELECT T.*
         FROM (select tpi.inv_id,

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -267,6 +267,8 @@ public class StaffService extends BaseService<Staff> {
         } else {
             staff.setLoginType(3);
         }
+//        初始标识
+        staff.setFlgInit(true);
         super.insert(staff);
         return ResponseResultUtil.success(staff);
     }