Merge remote-tracking branch 'origin/dev' into bo_daily
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<mapper
|
||||
namespace="app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper">
|
||||
|
||||
<insert id="createHousehold">
|
||||
<update id="createHousehold">
|
||||
/* createHousehold : 임가 등록 */
|
||||
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
|
||||
SELECT nextval('household_seq')
|
||||
@@ -79,7 +79,7 @@
|
||||
</if>
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
</insert>
|
||||
</update>
|
||||
|
||||
<insert id="createHouseholdHasRole">
|
||||
/* createHouseholdHasRole : 임가 역할 등록 */
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
<when test="cmd.searchField eq 'name'">
|
||||
AND a.name ILIKE '%' || #{cmd.searchValue} || '%'
|
||||
</when>
|
||||
|
||||
<when test="cmd.searchField eq 'phone'">
|
||||
AND a.phone ILIKE '%' || #{cmd.searchValue} || '%'
|
||||
</when>
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
join researcher_has_household rhh ON h.seq = rhh.household_seq and rhh.is_deleted = false
|
||||
left join uicode rm ON rm.parent_id = 'code.region.main' AND rm.id = h.region_main_code
|
||||
left join uicode rs ON rs.parent_id = 'code.region.sub' AND rs.id = h.region_sub_code
|
||||
left join uicode rd ON rd.parent_id = 'code.region.detail' AND rd.id = h.region_detail_code
|
||||
left join uicode rd ON rd.id = h.region_detail_code
|
||||
left join uicode il ON il.parent_id = 'code.industry.large' AND il.id = h.industry_large_code
|
||||
left join uicode im ON im.parent_id = 'code.industry.middle' AND im.id = h.industry_middle_code
|
||||
where 1=1
|
||||
@@ -357,4 +357,12 @@
|
||||
ORDER BY hvr.householdNum ASC
|
||||
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
|
||||
</select>
|
||||
|
||||
|
||||
<select id="selectResearcherId">
|
||||
select seq
|
||||
from admin a
|
||||
join admin_has_role ahr on ahr.admin_seq = a.seq and ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false
|
||||
where a.id = #{id} and a.is_deleted = false
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user