Merge branch 'master' of http://git.pseer.com:8800/platform/hg-smart into dev

 Conflicts:
	src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
	src/main/resources/application.properties
	src/main/resources/quartz.properties

src/main/java/com/baosight/hggp/core/security/UserSessionUtils.java

@@ -133,6 +133,27 @@ public class UserSessionUtils extends UserSession {
 	}
 	
 	/**
+	 * 获取登录用户的所有组
+	 *
+	 * @return
+	 */
+	public static List<String> getAllGroupCode() {
+		List<Org> orgs = HGXSTools.XsOrg.queryByUser();
+		if (CollectionUtils.isEmpty(orgs)) {
+			return new ArrayList<>();
+		}
+		List<String> prodGroupCodes = new ArrayList<>();
+		for (Org org : orgs) {
+			if (OrgTypeEnum.PROD_GROUP.getCode().equals(org.getOrgType())
+					|| OrgTypeEnum.CUT_GROUP.getCode().equals(org.getOrgType())
+					|| OrgTypeEnum.SYN_GROUP.getCode().equals(org.getOrgType())) {
+				prodGroupCodes.add(org.getOrgId());
+			}
+		}
+		return prodGroupCodes;
+	}
+	
+	/**
 	 * 获取登录用户所有角色
 	 *
 	 * @return