微信登录增加默认仓库

src/main/java/com/dk/mdm/mapper/mst/StaffMapper.xml

@@ -35,6 +35,8 @@
         <result column="op_db_user" property="opDbUser"/>
         <result column="flg_can_login" property="flgCanLogin"/>
         <result column="hr_status" property="hrStatus"/>
+        <result column="default_wh_id" property="defaultWhId"/>
+        <result column="default_wh_name" property="defaultWhName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -129,12 +131,27 @@
         SELECT
         <include refid="Base_Column_List"/>
         , org.org_name,
+        CASE
+        WHEN tmow.wh_id IS NULL THEN
+        (SELECT wh_id FROM dkic_b.t_mst_warehouse where cp_id = T.cp_id and flg_default)
+        ELSE  tmow.wh_id
+        END AS default_wh_id,
+        CASE
+        WHEN tmw.wh_name IS NULL THEN
+        (SELECT wh_name FROM dkic_b.t_mst_warehouse where cp_id = T.cp_id and flg_default)
+        ELSE tmw.wh_name
+        END AS default_wh_name,
         case when t.hr_status = 1 then '在职' else '离职' end as  hr_status_name,
+
         (SELECT  COALESCE(array_to_string(array_agg(role_name), ','),'')
         FROM dkic_b.t_mst_role
         WHERE role_id = ANY (t.role_ids)) AS role_names
         FROM dkic_b.t_mst_staff t
         LEFT JOIN dkic_b.t_mst_org org ON t.org_Id = org.org_Id
+        LEFT JOIN dkic_b.t_mst_org_wh tmow ON tmow.cp_id = T.cp_id
+        AND tmow.org_id = T.org_id
+        AND tmow.flg_default
+        LEFT JOIN dkic_b.t_mst_warehouse tmw ON tmw.wh_id = tmow.wh_id
         WHERE t.wx_user_id = #{userId}::uuid
     </select>