Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

2018-11-14 11:33:00 +08:00
parent 13f9f71798 463a43c0c1
commit 1516bd6b84
6 changed files with 28 additions and 6 deletions
--- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java
+++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java
@@ -140,6 +140,9 @@ public class AsnIpController extends BaseController{
 			ConfigGroupInfo info=AsnCacheUtils.get(Long.parseLong(id));
 			if(info!=null) {
 				groupMap.put(id, info.getGroupName());
+			}else {
+				info=asnIpCfgService.getConfigGroupInfoByAsnNo(Long.parseLong(id));
+				groupMap.put(id, info.getGroupName());
 			}
 		}
 		return groupMap;