Selaa lähdekoodia

新增业务部门标识

于继渤 1 vuosi sitten
vanhempi
commit
3e7e67a192

+ 4 - 0
src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -167,6 +167,7 @@
         display_no AS "displayNo",
         display_no AS "displayNo",
         remarks
         remarks
         ,flg_valid as "flgValid"
         ,flg_valid as "flgValid"
+        ,flg_business as "flgBusiness"
         from dkic_b.t_mst_org
         from dkic_b.t_mst_org
         where flg_valid
         where flg_valid
         and cp_id = #{cpId}
         and cp_id = #{cpId}
@@ -182,6 +183,9 @@
         <if test="orgName != null">
         <if test="orgName != null">
             AND org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
             AND org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
         </if>
         </if>
+        <if test="flgBusiness != null">
+            AND flg_business  = #{flgBusiness}
+        </if>
         <if test="ids != null and ids.size() > 0 ">
         <if test="ids != null and ids.size() > 0 ">
             order by case org_id
             order by case org_id
             <foreach collection="ids" index="index" item="item">
             <foreach collection="ids" index="index" item="item">

+ 2 - 0
src/main/java/com/dk/mdm/mapper/mst/StaffMapper.xml

@@ -20,6 +20,7 @@
         <result column="staff_phone" property="staffPhone"/>
         <result column="staff_phone" property="staffPhone"/>
         <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
         <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
         <result column="org_name" property="orgName"/>
         <result column="org_name" property="orgName"/>
+        <result column="flg_business" property="flgBusiness"/>
         <result column="hr_status_name" property="hrStatusName"/>
         <result column="hr_status_name" property="hrStatusName"/>
         <result column="role_names" property="roleNames"/>
         <result column="role_names" property="roleNames"/>
         <result column="role_ids" property="roleIds" typeHandler="UuidListTypeHandler"/>
         <result column="role_ids" property="roleIds" typeHandler="UuidListTypeHandler"/>
@@ -149,6 +150,7 @@
         SELECT
         SELECT
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         , org.org_name,
         , org.org_name,
+        org.flg_business,
         CASE
         CASE
         WHEN tmow.wh_id IS NULL THEN
         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)
         (SELECT wh_id FROM dkic_b.t_mst_warehouse where cp_id = T.cp_id and flg_default)