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

Merge branch 'jsp'

Browse Source
This commit is contained in:
itn 2023-07-05 09:54:46 +09:00
commit 5530aa37c5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/itn/let/fax/addr/web/FaxAddrController.java
View File

@ -57,8 +57,6 @@ import itn.let.fax.addr.service.FaxAddrGroupVO;
import itn.let.fax.addr.service.FaxAddrService; import itn.let.fax.addr.service.FaxAddrService;
import itn.let.fax.addr.service.FaxAddrTransHistVO; import itn.let.fax.addr.service.FaxAddrTransHistVO;
import itn.let.fax.addr.service.FaxAddrVO; import itn.let.fax.addr.service.FaxAddrVO;
import itn.let.mjo.addr.service.AddrGroupVO;
import itn.let.mjo.addr.service.AddrVO;
import itn.let.mjo.msgdata.service.PhoneVO; import itn.let.mjo.msgdata.service.PhoneVO;
@Controller @Controller
@ -1679,7 +1677,6 @@ public class FaxAddrController {
if(userId != "") { if(userId != "") {
addrGroupVO.setMberId(userId); addrGroupVO.setMberId(userId);
}
if(addrGroupVO.getPageUnit() != 10) { if(addrGroupVO.getPageUnit() != 10) {
addrGroupVO.setPageUnit(addrGroupVO.getPageUnit()); addrGroupVO.setPageUnit(addrGroupVO.getPageUnit());
@ -1693,6 +1690,7 @@ public class FaxAddrController {
addrGroupVO.setSiteId("web"); addrGroupVO.setSiteId("web");
addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(addrGroupVO); addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(addrGroupVO);
} }
}
catch(Exception e) { catch(Exception e) {
isSuccess = false; isSuccess = false;
msg = e.getMessage(); msg = e.getMessage();