diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index b2aff98ec..831545362 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -21,11 +21,14 @@ public class BaseEntity implements Serializable { @Transient private String sortOrder; - //back @Transient - protected String sortColumns; + public String sortColumns; public String getSortColumns() { + if(StringUtils.isNotBlank(sortColumns)){ + return sortColumns; + } + String result = null; try { //扫描子类SortColumn注解的属性,替换sortColumn diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index fa4fde46d..c1e8a4218 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -28,10 +28,6 @@ public class WxMerchant extends BaseEntity { this.id = id; } - public String getSortColumns() { - return sortColumns; - } - public List getIds() { return ids; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 4e91adc05..4725e3765 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -1,7 +1,6 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; -import com.iformall.common.SortColumn; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -373,7 +372,7 @@ public class WxShop extends BaseEntity { sb.append(","); sb.append(fields[k].toString()); } - this.sortColumns=sb.toString(); + sortColumns=sb.toString(); } public void setSortColumns(String sortColumns) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 4c6c0569f..ce7539119 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -18,10 +18,8 @@ import com.iformall.service.WxShopService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*;