Merge remote-tracking branch 'origin/dev/diagbotcloud20190924_diagnose2' into dev/diagbotcloud20190924_diagnose2

knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -157,7 +157,10 @@ public class RelationContactFacade extends RelationServiceImpl {
 		relationQe.eq("start_id", conceptId);
 		if(relationNodeVO!=null&&relationNodeVO.getSonRelationId()!=null){
 			relationQe.eq("relation_id", relationNodeVO.getSonRelationId());
+		}else{
+			relationQe.eq("relation_id", -999999l);
 		}
+		
 		List<Relation> relationList = list(relationQe);
 		
 		if(ListUtil.isNotEmpty(relationList)){

log-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -1,6 +1,5 @@
 package com.diagbot.web;
 
-
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

uaa-service/src/main/java/com/diagbot/service/UrlUserService.java

@@ -36,7 +36,8 @@ public class UrlUserService implements UserDetailsService {
             List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
             for (Permission permission : permissions) {
                 if (null != permission && StringUtils.isNotBlank(permission.getPermissionUrl())) {
-                    GrantedAuthority grantedAuthority = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());
+                    GrantedAuthority grantedAuthority
+                            = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());
                     grantedAuthorities.add(grantedAuthority);
                 }
             }