Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/MealCardRunTab/MealCardRunTabService.cs

@@ -164,8 +164,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["accountName"].IsEmpty())
                 {
-                    dp.Add("accountName", "%" + queryParam["accountName"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.accountName Like @accountName ");
+                    var IsPhone = queryParam["IsPhone"].ToString();
+                    if (IsPhone == "0")
+                    {
+                        dp.Add("accountName", queryParam["accountName"].ToString(), DbType.String);
+                        strSql.Append(" AND t.accountName = @accountName ");
+                    }
+                    else
+                    {
+                        dp.Add("accountName", "%" + queryParam["accountName"].ToString() + "%", DbType.String);
+                        strSql.Append(" AND t.accountName Like @accountName ");
+                    }
                 }
                 if (!queryParam["depName"].IsEmpty())
                 {
@@ -182,18 +191,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("identiName", queryParam["identiName"].ToString(), DbType.String);
                     strSql.Append(" AND t.identiName = @identiName ");
                 }
-                if (!queryParam["IsStuOrTeach"].IsEmpty())
-                {
-                    var IsStuOrTeach = queryParam["IsStuOrTeach"].ToString();
-                    if (IsStuOrTeach == "0")
-                    {
-                        strSql.Append(" AND t.identiName = '教师' ");
-                    }
-                    else if (IsStuOrTeach == "1")
-                    {
-                        strSql.Append(" AND t.identiName = '学生' ");
-                    }
-                }
                 if (!queryParam["flowtype"].IsEmpty())
                 {
                     dp.Add("flowtype", queryParam["flowtype"].ToString(), DbType.String);

Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-tree.vue

@@ -21,7 +21,8 @@
       ></image>
 
       <!-- 名称 -->
-      <text class="tree-item-title">{{ name }}</text>
+      <!-- <text class="tree-item-title">{{ name }}</text> -->
+      <text class="tree-item-title">{{ name + (mobile ? '(' +mobile + ')' : "") }}</text>
 
       <!-- 非用户，显示后置标题 -->
       <l-tag v-if="root.type !== 'user' || staffTag" :line="tagColor" size="sm" class="margin-left-sm">
@@ -196,6 +197,14 @@ export default {
       const rootItem = this.GET_GLOBAL(this.root.type)[this.root.id]
       return rootItem ? rootItem.name : '(根节点)'
     },
+	mobile() {
+	  if (this.root.mobile) {
+	    return this.root.mobile
+	  }
+	
+	  const rootItem = this.GET_GLOBAL(this.root.type)[this.root.id]
+	  return rootItem ? rootItem.mobile: '(根节点)'
+	},
 
     // 头像圆形/方形显示参数
     roundAvatar() {