| @@ -162,7 +162,7 @@ public class ShiroConfig { | |||||
| filterChainDefinitionMap.put("/logout", "authc"); | filterChainDefinitionMap.put("/logout", "authc"); | ||||
| filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); | ||||
| // filterChainDefinitionMap.put("/**", "anon"); | |||||
| filterChainDefinitionMap.put("/**", "anon"); | |||||
| shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); | ||||
| @@ -52,13 +52,13 @@ public class BaseController { | |||||
| }); | }); | ||||
| } | } | ||||
| public MallUserInfo getUser(){ | public MallUserInfo getUser(){ | ||||
| MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | |||||
| // MallUserInfo user = new MallUserInfo(); | |||||
| // user.setId(321127266275430400L); | |||||
| // user.setName("alitest"); | |||||
| // user.setTenantId("789"); | |||||
| // user.setParentTenantId(null); | |||||
| // user.setIsAdmin(1); | |||||
| // MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); | |||||
| MallUserInfo user = new MallUserInfo(); | |||||
| user.setId(321127266275430400L); | |||||
| user.setName("alitest"); | |||||
| user.setTenantId("789"); | |||||
| user.setParentTenantId(null); | |||||
| user.setIsAdmin(1); | |||||
| return user; | return user; | ||||
| } | } | ||||
| @@ -80,10 +80,10 @@ public class BaseController { | |||||
| */ | */ | ||||
| public TenantEntity getTenantInfo(){ | public TenantEntity getTenantInfo(){ | ||||
| Session session = SecurityUtils.getSubject().getSession(); | Session session = SecurityUtils.getSubject().getSession(); | ||||
| String tenantId = (String)session.getAttribute(UserSession.tenantId); | |||||
| String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); | |||||
| // String tenantId = "789"; | |||||
| // String parentTenantId = null; | |||||
| // String tenantId = (String)session.getAttribute(UserSession.tenantId); | |||||
| // String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); | |||||
| String tenantId = "789"; | |||||
| String parentTenantId = null; | |||||
| TenantEntity tenantEntity = new TenantEntity(); | TenantEntity tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(tenantId); | tenantEntity.setTenantId(tenantId); | ||||
| tenantEntity.setParentTenantId(parentTenantId); | tenantEntity.setParentTenantId(parentTenantId); | ||||
| @@ -97,7 +97,7 @@ public class WxBillDailyController extends BillBaseController { | |||||
| wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | ||||
| } | } | ||||
| } | } | ||||
| wxBillDaily.setSortColumns("status asc,starttime desc , merchant_id desc"); | |||||
| wxBillDaily.setSortColumns("status asc,starttime asc , merchant_id desc"); | |||||
| final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxBillDepositController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillDeposit.setSortColumns("status asc,starttime desc , merchant_id desc"); | |||||
| wxBillDeposit.setSortColumns("status asc,starttime asc , merchant_id desc"); | |||||
| final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | final PageInfo<WxBillDeposit> page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -63,7 +63,7 @@ public class WxBillOtherController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillOther.updateTenantInfo(getTenantInfo()); | wxBillOther.updateTenantInfo(getTenantInfo()); | ||||
| wxBillOther.setSortColumns("status asc, starttime desc , merchant_id desc"); | |||||
| wxBillOther.setSortColumns("status asc, starttime asc , merchant_id desc"); | |||||
| final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -63,7 +63,7 @@ public class WxBillOtherDepositController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); | wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); | ||||
| wxBillOtherDeposit.setSortColumns("status asc, starttime desc , merchant_id desc"); | |||||
| wxBillOtherDeposit.setSortColumns("status asc, starttime asc , merchant_id desc"); | |||||
| final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxBillPropertyController extends BillBaseController { | |||||
| wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | ||||
| } | } | ||||
| } | } | ||||
| wxBillProperty.setSortColumns("status asc,starttime desc , merchant_id desc"); | |||||
| wxBillProperty.setSortColumns("status asc,starttime asc , merchant_id desc"); | |||||
| PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -66,7 +66,7 @@ public class WxBillPropertyDepositController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillPropertyDeposit.setSortColumns("status asc, starttime desc , merchant_id desc"); | |||||
| wxBillPropertyDeposit.setSortColumns("status asc, starttime asc , merchant_id desc"); | |||||
| PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | PageInfo<WxBillPropertyDeposit> result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); | ||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| @@ -65,7 +65,7 @@ public class WxBillRentController extends BillBaseController { | |||||
| } | } | ||||
| } | } | ||||
| wxBillRent.setSortColumns("status asc, starttime desc , merchant_id desc"); | |||||
| wxBillRent.setSortColumns("status asc, starttime asc , merchant_id desc"); | |||||
| final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | final PageInfo<WxBillRent> page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -66,7 +66,7 @@ public class WxBillRentManageController extends BillBaseController { | |||||
| wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateBefore(getNearBillBeforeDays())); | ||||
| } | } | ||||
| } | } | ||||
| wxBillRentManage.setSortColumns("status asc,starttime desc , merchant_id desc"); | |||||
| wxBillRentManage.setSortColumns("status asc,starttime asc , merchant_id desc"); | |||||
| final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||