From 7f905053f3f879092e18558401185dd6595dbe10 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 15:11:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 22c16d9..6e8c2c3 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -8,18 +8,22 @@
import javax.annotation.Resource;
-import com.github.pagehelper.PageHelper;
-import com.moral.common.bean.Constants;
-import com.moral.common.bean.PageBean;
-import com.moral.common.util.*;
-import com.moral.entity.Device;
-import com.moral.mapper.DeviceMapper;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
+import com.github.pagehelper.PageHelper;
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
+import com.moral.common.util.ExampleUtil;
+import com.moral.common.util.RedisUtils;
+import com.moral.common.util.StringUtils;
+import com.moral.common.util.ValidateUtil;
+import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
+import com.moral.mapper.DeviceMapper;
import com.moral.mapper.MonitorPointMapper;
import com.moral.service.MonitorPointService;
+
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.entity.Example.Criteria;
@@ -174,11 +178,14 @@
@Override
public List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId) {
- MonitorPoint monitorPoint = new MonitorPoint();
- monitorPoint.setIsDelete(Constants.IS_DELETE_FALSE);
+ Example example = new Example(MonitorPoint.class);
+ Criteria criteria = example.createCriteria();
+
+ criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
if (Constants.isNotSpecialOrgId(orgId)) {
- monitorPoint.setOrganizationId(orgId);
+ criteria.andEqualTo("organizationId", orgId);
}
- return monitorPointMapper.select(monitorPoint);
+ example.orderBy("name").asc();
+ return monitorPointMapper.selectByExample(example);
}
}
--
Gitblit v1.8.0