DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

통역인 검색 뭐리 수정. 

사용자 부서 편집 허용
master
최강석 2024-02-29 11:50:58 +09:00
parent f3224dcc83
commit 41617b234d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/mybatisMapper/TranslatorMapper.xml
View File

@ -11,7 +11,8 @@
and tr_lang = #{trLang} and tr_lang = #{trLang}
</if> </if>
<if test='ogdp1 != null and ogdp1 != ""'> <if test='ogdp1 != null and ogdp1 != ""'>
and ogdp1 = #{ogdp1} and (ogdp1 = #{ogdp1}
or ogdp1 in (select organ_cd from organ_config where parent_organ = #{ogdp1}))
</if> </if>
<if test='trName != null and trName != ""'> <if test='trName != null and trName != ""'>
and tr_name = #{trName} and tr_name = #{trName}
@ -74,7 +75,7 @@
left outer join code_mgt g on a.tr_edu = g.item_cd left outer join code_mgt g on a.tr_edu = g.item_cd
left outer join code_mgt h on a.tr_visa = h.item_cd left outer join code_mgt h on a.tr_visa = h.item_cd
<include refid="selectTranslatorListWhere"></include> <include refid="selectTranslatorListWhere"></include>
order by translator_key desc order by ogdp1, translator_key desc
limit #{rowCnt} offset #{firstIndex} limit #{rowCnt} offset #{firstIndex}
</select> </select>

2
src/main/resources/templates/adminPage/userMgt/userEditModal.html
View File

@ -102,7 +102,7 @@
<div class="row mb-1"> <div class="row mb-1">
<label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label> <label for="ofcCd" class="col-sm-2 col-form-label col-form-label-sm text-center">부서</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select form-select-sm" id="ofcCd" name="ofcCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}"> <select class="form-select form-select-sm" id="ofcCd" name="ofcCd"><!-- th:disabled="${!#strings.isEmpty(userInfo.dicCode)}"-->
<option value="">--선택--</option> <option value="">--선택--</option>
<th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}"> <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${userInfo.ofcCd eq code.itemCd}"></option> <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${userInfo.ofcCd eq code.itemCd}"></option>

4
src/main/resources/templates/adminPage/userMgt/userMgt.html
View File

@ -48,7 +48,7 @@
</th:block> </th:block>
</select> </select>
</div> </div>
<div class="col-auto"> <!--<div class="col-auto">
<select class="form-select form-select-sm" name="ofcCd" id="ofcCdSearch"> <select class="form-select form-select-sm" name="ofcCd" id="ofcCdSearch">
<option value="">부서 선택</option> <option value="">부서 선택</option>
<th:block th:each="parentCode:${session.commonCode.get('OG')}"> <th:block th:each="parentCode:${session.commonCode.get('OG')}">
@ -58,7 +58,7 @@
</th:block> </th:block>
</th:block> </th:block>
</select> </select>
</div> </div>-->
<div class="col-auto"> <div class="col-auto">
<select class="form-select form-select-sm" name="titleCd"> <select class="form-select form-select-sm" name="titleCd">
<option value="">계급 선택</option> <option value="">계급 선택</option>