|
@@ -336,7 +336,7 @@ public class PartnershipServiceImpl implements PartnershipService {
|
|
|
public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
|
|
public Predicate toPredicate(Root<PartnershipRecord> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
|
|
|
// 添加排序
|
|
// 添加排序
|
|
|
Predicate preStatusCode = cb.equal(root.get("statusCode").as(Short.class), statusCode);
|
|
Predicate preStatusCode = cb.equal(root.get("statusCode").as(Short.class), statusCode);
|
|
|
- query.orderBy(cb.desc(root.get("statusCode")));
|
|
|
|
|
|
|
+ query.orderBy(cb.desc(root.get("status").as(String.class)), cb.desc(root.get("operateDate").as(Long.class)));
|
|
|
|
|
|
|
|
// 营业执照号为空,则查询所有的
|
|
// 营业执照号为空,则查询所有的
|
|
|
if (StringUtils.isEmpty(businessCode)) {
|
|
if (StringUtils.isEmpty(businessCode)) {
|