diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java index a486059cf..3f0d53b90 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java @@ -31,7 +31,6 @@ public class WxBusinessController extends BaseController @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { if (null == wxBusiness) wxBusiness = new WxBusiness(); - wxBusiness.setTenantId(getTenantId()); final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java index 7e522ad09..0660448ef 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -32,7 +32,6 @@ public class WxBusinessController extends BaseController { public ResultData list(WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { if (null == wxBusiness) wxBusiness = new WxBusiness(); WxCUser user = getUser(); - wxBusiness.setTenantId(user.getTenantId()); final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java index 7b4cf4f18..b6ffd861c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java @@ -41,9 +41,6 @@ public class WxBusiness implements Serializable { - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; /*业态名**/ @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") private String title; @@ -56,12 +53,6 @@ public class WxBusiness implements Serializable { /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } public String getTitle() { return title; } @@ -92,11 +83,10 @@ public class WxBusiness implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ; private String value; Field(String value){ @@ -129,6 +119,8 @@ public class WxBusiness implements Serializable { sb.append(","); sb.append(fields[k].toString()); } + + this.sortColumns = sb.toString(); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java index 9c89beddc..5a20ac9da 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxChannel.java @@ -41,9 +41,6 @@ public class WxChannel implements Serializable { - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") - private Long tenantId; /*渠道ID**/ @io.swagger.annotations.ApiModelProperty(value="渠道ID",name="channelId") private Integer channelId; @@ -53,12 +50,6 @@ public class WxChannel implements Serializable { /*图片url**/ @io.swagger.annotations.ApiModelProperty(value="图片url",name="img") private String img; - public Long getTenantId() { - return tenantId; - } - public void setTenantId(Long _tenantId) { - tenantId = _tenantId; - } public Integer getChannelId() { return channelId; } @@ -83,8 +74,7 @@ public class WxChannel implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,ChannelId_ASC("`channelId` ASC"),ChannelId_DESC("`channelId` DESC") + ,ChannelId_ASC("`channel_id` ASC"),ChannelId_DESC("`channel_id` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") ,Img_ASC("`img` ASC"),Img_DESC("`img` DESC") ; @@ -119,6 +109,8 @@ public class WxChannel implements Serializable { sb.append(","); sb.append(fields[k].toString()); } + + this.sortColumns = sb.toString(); }