Sfoglia il codice sorgente

[业态/频道][修改]:取消租户ID

release_toaliyun_real
Stormeye.Wu 7 anni fa
parent
commit
0fdb63312b
4 ha cambiato i file con 7 aggiunte e 25 eliminazioni
  1. +0
    -1
      mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java
  2. +0
    -1
      mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java
  3. +4
    -12
      mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java
  4. +3
    -11
      mallinkService/src/main/java/com/simple/domain/po/WxChannel.java

+ 0
- 1
mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java Vedi File

@@ -31,7 +31,6 @@ public class WxBusinessController extends BaseController
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { public ResultData list(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) {
if (null == wxBusiness) wxBusiness = new WxBusiness(); if (null == wxBusiness) wxBusiness = new WxBusiness();
wxBusiness.setTenantId(getTenantId());
final PageInfo<WxBusiness> page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); final PageInfo<WxBusiness> page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 0
- 1
mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java Vedi File

@@ -32,7 +32,6 @@ public class WxBusinessController extends BaseController {
public ResultData list(WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { public ResultData list(WxBusiness wxBusiness, Integer pageNum, Integer pageSize) {
if (null == wxBusiness) wxBusiness = new WxBusiness(); if (null == wxBusiness) wxBusiness = new WxBusiness();
WxCUser user = getUser(); WxCUser user = getUser();
wxBusiness.setTenantId(user.getTenantId());
final PageInfo<WxBusiness> page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); final PageInfo<WxBusiness> page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 4
- 12
mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java Vedi File

@@ -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") @io.swagger.annotations.ApiModelProperty(value="业态名",name="title")
private String title; private String title;
@@ -56,12 +53,6 @@ public class WxBusiness implements Serializable {
/*更新时间**/ /*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;
public String getTenantId() {
return tenantId;
}
public void setTenantId(String _tenantId) {
tenantId = _tenantId;
}
public String getTitle() { public String getTitle() {
return title; return title;
} }
@@ -92,11 +83,10 @@ public class WxBusiness implements Serializable {
public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` 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; private String value;
Field(String value){ Field(String value){
@@ -129,6 +119,8 @@ public class WxBusiness implements Serializable {
sb.append(","); sb.append(",");
sb.append(fields[k].toString()); sb.append(fields[k].toString());
} }

this.sortColumns = sb.toString();
} }


+ 3
- 11
mallinkService/src/main/java/com/simple/domain/po/WxChannel.java Vedi File

@@ -41,9 +41,6 @@ public class WxChannel implements Serializable {
/***/
@io.swagger.annotations.ApiModelProperty(value="",name="tenantId")
private Long tenantId;
/*渠道ID**/ /*渠道ID**/
@io.swagger.annotations.ApiModelProperty(value="渠道ID",name="channelId") @io.swagger.annotations.ApiModelProperty(value="渠道ID",name="channelId")
private Integer channelId; private Integer channelId;
@@ -53,12 +50,6 @@ public class WxChannel implements Serializable {
/*图片url**/ /*图片url**/
@io.swagger.annotations.ApiModelProperty(value="图片url",name="img") @io.swagger.annotations.ApiModelProperty(value="图片url",name="img")
private String img; private String img;
public Long getTenantId() {
return tenantId;
}
public void setTenantId(Long _tenantId) {
tenantId = _tenantId;
}
public Integer getChannelId() { public Integer getChannelId() {
return channelId; return channelId;
} }
@@ -83,8 +74,7 @@ public class WxChannel implements Serializable {
public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
,Img_ASC("`img` ASC"),Img_DESC("`img` DESC") ,Img_ASC("`img` ASC"),Img_DESC("`img` DESC")
; ;
@@ -119,6 +109,8 @@ public class WxChannel implements Serializable {
sb.append(","); sb.append(",");
sb.append(fields[k].toString()); sb.append(fields[k].toString());
} }

this.sortColumns = sb.toString();
} }


Caricamento…
Annulla
Salva