tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO'

Browse Source
This commit is contained in:
JIWOO 2025-02-05 12:12:34 +09:00
commit 082cc1da84
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/seed/com/gtm/base/BaseController.java
View File

@ -813,7 +813,7 @@ public class BaseController {
private String getGWID(Map<String, Object> p_tmap) {
//Map<String, Object> tmap = (Map<String, Object>) JSPUtil.fixNull(memberService.memberNewOne(params));
//return p_tmap.get("MEMBER_ITEM_F6").toString();
if ("seed".equals(p_tmap.get("MEMBER_ID").toString())) {
if ("seed".equals(p_tmap.get("MEMBER_ID").toString()) || "seed2".equals(p_tmap.get("MEMBER_ID").toString())) {
return "test04";
}
return p_tmap.get("MEMBER_ID").toString();

1
src/main/java/seed/com/gtm/base/GwBaseController.java
View File

@ -8268,6 +8268,7 @@ v_ret = this.receiverHeader();
//return p_tmap.get("MEMBER_ITEM_F6").toString();
if ("seed".equals(p_tmap.get("MEMBER_ID").toString())
|| "unpl".equals(p_tmap.get("MEMBER_ID").toString())
|| "seed2".equals(p_tmap.get("MEMBER_ID").toString())
) {
return "test04";
}

9
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -546,6 +546,11 @@ $("#periodCalulation").click(function(){
//담당자 변경
$("#changeExaminer").click(function(){
if($("#examinerAssign").val() == ''){
alert("담당자를 선택해 주십시오.");
return false;
}
if(confirm("담당자를 변경 하시겠습니까?")){
$("#typeTemp").val("U");
var param = jQuery('#frm').serialize();
@ -5053,7 +5058,7 @@ function docOpen(obj) {
<c:if test="${memberPosition == '0912000000' || memberPosition == '0911000000' || memberPosition == '0915000000'}">
<div class="btn_wrap">
<c:if test="${masterData.statePro == '0401000000' && (memberPosition == '0912000000' || memberPosition == '0911000000' || memberId =='seed')}">
<c:if test="${masterData.statePro == '0401000000' && (memberPosition == '0912000000' || memberPosition == '0911000000' || memberId =='seed' || memberId =='seed2')}">
<!-- 접수 -->
<div class="area_left">
<button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('1', '<c:out value="${masterData.caseNo }"/> 사건착수보고');">착수보고</button>
@ -9731,7 +9736,7 @@ function docOpen(obj) {
</div>
</div>
<c:if test="${memberPosition == '0911000000'}">
<c:if test="${memberPosition == '0911000000' || memberPosition == '0915000000'}">
<!-- 팀장 조사관 변경 기능 -->
<div class="bbs-view-layout" style="margin-bottom: 20px;margin-top: 20px;">
<div class="bbs-view-item">

2
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit_bak.jsp
View File

@ -4230,7 +4230,7 @@ function nanumProcessStartTmp(){
<c:if test="${memberPosition == '0912000000' || memberPosition == '0911000000' || memberPosition == '0915000000'}">
<div class="btn_wrap">
<c:if test="${masterData.statePro == '0401000000' && (memberPosition == '0912000000' || memberPosition == '0911000000' || memberId =='seed')}">
<c:if test="${masterData.statePro == '0401000000' && (memberPosition == '0912000000' || memberPosition == '0911000000' || memberId =='seed' || memberId =='seed2')}">
<!-- 접수 -->
<div class="area_left">
<button type="button" class="btn-default btn btn_text btn_36 blue_border" onclick="nanumCall('1', '<c:out value="${masterData.caseNo }"/> 사건착수보고');">착수보고</button>