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

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs

@@ -295,7 +295,7 @@ namespace Learun.Application.Organization
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(fieldStr.Replace("t.F_Password,", "").Replace("t.F_Secretkey,", ""));
-                strSql.Append(" FROM LR_Base_User t WHERE t.F_DeleteMark = 0  and F_EnabledMark =0 ORDER BY t.F_CompanyId,t.F_DepartmentId,t.F_RealName ");
+                strSql.Append(" FROM LR_Base_User t WHERE t.F_DeleteMark = 0  and F_EnabledMark =1 ORDER BY t.F_CompanyId,t.F_DepartmentId,t.F_RealName ");
                 return this.BaseRepository().FindList<UserEntity>(strSql.ToString());
             }
             catch (Exception ex)