From 84fa4cc7d487e90f59f241a266f44299903dfbfa Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sun, 29 Oct 2017 16:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
index 7559384..c44c6fe 100644
--- a/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
+++ b/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.java
@@ -12,10 +12,11 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import com.alibaba.fastjson.JSON;
import com.moral.monitor.dao.AccountEntityMapper;
@@ -195,8 +196,13 @@
}
public void setOrgIdsByAccount(Map<String, Object> parameters) {
- AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf((String) parameters.get("accountId"))));
- if (null == account) {
+ String accountId = ObjectUtils.nullSafeToString(parameters.get("accountId"));
+ if (!StringUtils.isNumeric(accountId) ) {
+ return;
+ }
+
+ AccountEntity account = accountMapper.selectByPrimaryKey((Integer.valueOf(accountId)));
+ if (ObjectUtils.isEmpty(account)) {
return;
}
String organization = account.getOrganization();
--
Gitblit v1.8.0