조회조건 오류수정

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"};

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")){

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
+    <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>

src/main/resources/templates/equip/cellPhoneList.html

@@ -45,10 +45,8 @@
                                 <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>
-                                  </th:block>
                                 </select>
                               </div>
                               <div class="col-2">