Merge branch 'jsp'
This commit is contained in:
commit
5530aa37c5
@ -57,8 +57,6 @@ import itn.let.fax.addr.service.FaxAddrGroupVO;
|
||||
import itn.let.fax.addr.service.FaxAddrService;
|
||||
import itn.let.fax.addr.service.FaxAddrTransHistVO;
|
||||
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;
|
||||
|
||||
@Controller
|
||||
@ -1679,7 +1677,6 @@ public class FaxAddrController {
|
||||
|
||||
if(userId != "") {
|
||||
addrGroupVO.setMberId(userId);
|
||||
}
|
||||
|
||||
if(addrGroupVO.getPageUnit() != 10) {
|
||||
addrGroupVO.setPageUnit(addrGroupVO.getPageUnit());
|
||||
@ -1693,6 +1690,7 @@ public class FaxAddrController {
|
||||
addrGroupVO.setSiteId("web");
|
||||
addrGroupList = faxAddrGroupService.selectFaxAddrGroupList(addrGroupVO);
|
||||
}
|
||||
}
|
||||
catch(Exception e) {
|
||||
isSuccess = false;
|
||||
msg = e.getMessage();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user