Merge branch 'branch-nt-1.0.0' of https://git.flowbb.cn/RK-Dev/fqgz-server into branch-nt-1.0.0

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/User.java

@@ -150,7 +150,7 @@ public class User extends BaseEntity implements Serializable {
 	 * @return
 	 */
 	public String getUserType() {
-		if (StringUtils.isNotBlank(orgId) && orgId.contains(",")) {
+		if (StringUtils.isNotBlank(orgId) && orgId.contains("_")) {
 			return orgId.split("_")[0];
 		}
 		return "";
@@ -163,7 +163,7 @@ public class User extends BaseEntity implements Serializable {
 	 */
 	public String getComId() {
 		// 增加非空判断
-		if (StringUtils.isNotBlank(orgId) && orgId.contains(",")) {
+		if (StringUtils.isNotBlank(orgId) && orgId.contains("_")) {
 			return orgId.split("_")[1];
 		}
 		return "";