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 @@ where cm.mgt_organ = oc.organ_cd and cm.p_user_seq = ui.user_seq - and cm.mgt_organ in - - #{item} - + + and cm.mgt_organ in + + #{item} + + and cm.mgt_organ = #{mgtOrgan} 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 @@