From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改,同步reids里的信息。数据字典功能添加

---
 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
index 83ce35b..2442dc2 100644
--- a/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OrganizationServiceImpl.java
@@ -68,7 +68,7 @@
 		if(pageBean.getPageSize()>0){
 			PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
 		}
-		if(example.getOrderByClause().isEmpty()) {
+		if(example.getOrderByClause() == null || example.getOrderByClause().isEmpty()) {
 			example.setOrderByClause("create_time desc");
 		}
 		List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);

--
Gitblit v1.8.0