From 4adb17259341f22ecca27e236a4c43b1060fc95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Tue, 28 Mar 2023 17:35:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/main/equip/EquipController.java     |  3 ++-
 .../dbnt/faisp/main/fipTarget/FipTargetController.java |  8 +++++---
 src/main/resources/mybatisMapper/EquipMapper.xml       | 10 ++++++----
 src/main/resources/templates/equip/cellPhoneList.html  |  4 +---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java
index e7a80c27..a75c0686 100644
--- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java
+++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java
@@ -215,7 +215,8 @@ public class EquipController {
   @GetMapping("/cellPhoneList")
   public ModelAndView cellPhoneList(@AuthenticationPrincipal UserInfo loginUser,CellPhone cellPhone,HttpServletResponse response) {
     ModelAndView mav = new ModelAndView("equip/cellPhoneList");
-    cellPhone.setDownOrganCdList(loginUser.getDownOrganCdList());
+    /*230328 전체공개 요청으로 조건 주석처리*/
+    /*cellPhone.setDownOrganCdList(loginUser.getDownOrganCdList());*/
     //엑셀다운
     if(cellPhone.getExcel() != null && cellPhone.getExcel().equals("Y")){
       String[] headers = { "phone_key", "sosok", "tel_no", "user_nm", "ext_mail", "webex_no", "katalk_id"};
diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java
index c478f63d..3f257b68 100644
--- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java
+++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java
@@ -88,11 +88,12 @@ public class FipTargetController {
     //메뉴권한 확인
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/target/partInfoList").get(0).getAccessAuth();
     mav.addObject("accessAuth", accessAuth);
-    if(accessAuth.equals("ACC003")){
+    /*230328 전체공유로 변경되어 조건 주석처리*/
+    /*if(accessAuth.equals("ACC003")){
       partInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
     }else{
       partInfo.setMgtOrgan(loginUser.getOgCd());
-    }
+    }*/
     partInfo.setQueryInfo();
     mav.addObject("total", fipTargetService.selectWorkTypeTotal(partInfo));
     mav.addObject("partInfoList", fipTargetService.selectPartInfoList(partInfo));
@@ -513,7 +514,8 @@ public class FipTargetController {
   @GetMapping("/ipShipList")
   public ModelAndView ipShipList(@AuthenticationPrincipal UserInfo loginUser, ShipInfo shipInfo, HttpServletResponse response) {
     ModelAndView mav = new ModelAndView("fipTarget/ipShipList");
-    shipInfo.setDownOrganCdList(loginUser.getDownOrganCdList());
+
+    /*shipInfo.setDownOrganCdList(loginUser.getDownOrganCdList());*/
 
     //엑셀다운
     if(shipInfo.getExcel() != null && shipInfo.getExcel().equals("Y")){
diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml
index 46a42c3e..6bd3de84 100644
--- a/src/main/resources/mybatisMapper/EquipMapper.xml
+++ b/src/main/resources/mybatisMapper/EquipMapper.xml
@@ -410,10 +410,12 @@
   <sql id="selectCellPhoneListWhere">
     where cm.mgt_organ = oc.organ_cd
     and cm.p_user_seq = ui.user_seq
-    and cm.mgt_organ in
-    <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
-      #{item}
-    </foreach>
+    <if test='downOrganCdList != null'>
+      and cm.mgt_organ in
+      <foreach collection="downOrganCdList" item="item" index="index" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
     <if test='mgtOrgan != null and mgtOrgan != ""'>
       and cm.mgt_organ = #{mgtOrgan}
     </if>
diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html
index 55d877ad..f15d8387 100644
--- a/src/main/resources/templates/equip/cellPhoneList.html
+++ b/src/main/resources/templates/equip/cellPhoneList.html
@@ -45,9 +45,7 @@
                                 <select class="form-select form-select-sm" name="mgtOrgan">
                                   <option value="">소속</option>
                                   <th:block th:each="code:${session.commonCode.get('OG')}">
-                                    <th:block th:if="${#lists.contains(searchParams.downOrganCdList, code.itemCd)}">
-                                      <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.mgtOrgan}"></option>
-                                    </th:block>
+                                    <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.mgtOrgan}"></option>
                                   </th:block>
                                 </select>
                               </div>