diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 534f634d7..052b79787 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxBrand; import com.iformall.service.WxBrandService; import io.swagger.annotations.ApiImplicitParam; @@ -40,7 +41,7 @@ public class WxBrandController extends BaseController { if (null == wxBrand) { wxBrand = new WxBrand(); } - wxBrand.setSortColumns(Id_DESC); + wxBrand.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = wxBrandService.listAsPage(wxBrand, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index fc828235b..2ddf93b91 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.WxMerchantService; @@ -41,7 +42,7 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } @@ -56,7 +57,7 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java index 9dfcc6cab..63ec08caf 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMsgCallback; import com.iformall.service.WxMsgCallbackService; import io.swagger.annotations.ApiImplicitParam; @@ -35,7 +36,7 @@ public class WxMsgCallbackController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::list"); if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setTenantId(getTenantId()); - wxMsgCallback.setSortColumns(WxMsgCallback.Field.Createtime_DESC); + wxMsgCallback.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index e6268efe5..e0e755298 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.msg.WxMsg; import com.iformall.service.WxMsgService; import com.iformall.utils.Constant; @@ -47,7 +48,7 @@ public class WxMsgController extends BaseController { if (null == wxMsg) wxMsg = new WxMsg(); wxMsg.setTenantId(getTenantId()); //wxMsg.setWay(EnumSendWay.TAG.getCode()); - wxMsg.setSortColumns(WxMsg.Field.Createtime_DESC); + wxMsg.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java index f3e80a330..a95e464c0 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMsgModel; import com.iformall.service.WxMsgModelService; import io.swagger.annotations.ApiImplicitParam; @@ -33,7 +34,7 @@ public class WxMsgModelController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgModelController::list"); if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); wxMsgModel.setTenantId(getTenantId()); - wxMsgModel.setSortColumns(WxMsgModel.Field.Createtime_DESC); + wxMsgModel.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index fbede329c..828d536c9 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.WxMsgSignature; import com.iformall.service.WxMsgSignatureService; import io.swagger.annotations.ApiImplicitParam; @@ -33,7 +34,7 @@ public class WxMsgSignatureController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::list"); if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); wxMsgSignature.setTenantId(getTenantId()); - wxMsgSignature.setSortColumns(WxMsgSignature.Field.Createtime_DESC); + wxMsgSignature.setSortColumns(BaseEntity.SortField.Createtime_DESC); final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index eca16d488..c8d61842e 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -74,7 +74,7 @@ public class MallUserInfoController extends BaseController { public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); userInfo.setTenantId(getTenantId()); - userInfo.setSortColumns(MallUserInfo.Field.CreateTime_DESC,MallUserInfo.Field.Id_DESC); + userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { MallUserRole r = new MallUserRole();