Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

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

@@ -240,6 +240,11 @@ namespace Learun.Application.Organization
         /// </summary>	
         [Column("F_MODIFYPWDDATE")]
         public DateTime? F_ModifyPwdDate { get; set; }
+        /// <summary>
+        /// 账户
+        /// </summary>	
+        [Column("N_ACCOUNT")]
+        public string N_Account { get; set; }
         #endregion
 
         #region  扩展操作

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

@@ -39,7 +39,7 @@ namespace Learun.Application.Organization
                 strSql.Append("SELECT ");
                 strSql.Append(fieldSql);
                 strSql.Append(" FROM LR_Base_User t ");
-                strSql.Append(" WHERE t.F_Account = @account AND t.F_DeleteMark = 0  ");
+                strSql.Append(" WHERE (t.F_Account = @account or t.N_Account=@account) AND t.F_DeleteMark = 0  ");
                 return this.BaseRepository().FindEntity<UserEntity>(strSql.ToString(), new { account = account });
             }
             catch (Exception ex)
@@ -206,7 +206,7 @@ namespace Learun.Application.Organization
                 if (!string.IsNullOrEmpty(keyword))
                 {
                     keyword = "%" + keyword + "%";
-                    strSql.Append(" AND( t.F_Account like @keyword or t.F_RealName like @keyword  or t.F_Mobile like @keyword  ) ");
+                    strSql.Append(" AND( t.F_Account like @keyword or t.F_RealName like @keyword  or t.N_Account like @keyword or t.F_Mobile like @keyword  ) ");
                 }
                 
                 return this.BaseRepository().FindList<UserEntity>(strSql.ToString(), new { companyId, departmentId, keyword }, pagination);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.js

@@ -106,7 +106,7 @@ var bootstrap = function ($, learun) {
                 var value = $(this).attr('data-folderId');
                 var folderId = $(".crumb-path span:last").attr('data-folderId');
                 if (value == "back") {
-                    if (folderId == 0) {
+                    if (folderId == 0 || folderId=="null") {
                         $(".crumb-path .back").hide();
                     }
                     $.lrSetForm(top.$.rootUrl + _url + '?folderId=' + folderId, function (data) {//

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -47,6 +47,10 @@
                             <div class="lr-form-item-title">工号</div>
                             <input id="F_EnCode" type="text" class="form-control" readonly />
                         </div>
+                        <div class="lr-form-item">
+                            <div class="lr-form-item-title">新工号</div>
+                            <input id="F_EnCodenew" type="text" class="form-control" readonly />
+                        </div>
                         <div class="lr-form-item">
                             <div class="lr-form-item-title">姓名</div>
                             <input id="F_RealName" type="text" class="form-control" readonly />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.js

@@ -39,6 +39,7 @@ var bootstrap = function ($, learun) {
                     /*基础信息*/
                     $('#F_Account').val(baseinfo.account);
                     $('#F_EnCode').val(baseinfo.enCode);
+                    $('#F_EnCodenew').val(baseinfo.newenCode);
                     $('#F_RealName').val(baseinfo.realName);
                     $('#F_Gender').val(baseinfo.gender == 0 ? '女' : '男');
                     learun.clientdata.getAsync('company', {

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config

@@ -25,7 +25,7 @@
 	<add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />-->
 
   <!--西昌-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_黑龙江艺术;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_黑龙江艺术;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=123.57.209.16,53314;Initial Catalog=adms7ultimate2_黑龙江艺术;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16,53314;Initial Catalog=CollegeMIS_黑龙江艺术;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16,53314;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
 </connectionStrings>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FileInfo/FileInfoService.cs

@@ -59,7 +59,7 @@ namespace Learun.Application.OA.File.FileInfo
             var strSql = new StringBuilder();
             string folderCondition = "";
             string fileCondition = "";
-            if (!string.IsNullOrEmpty(folderId))
+            if (!string.IsNullOrEmpty(folderId)&&folderId!="null")
             {
                 folderCondition = " AND F_ParentId = @folderId";
                 fileCondition = " AND F_FolderId = @folderId";
@@ -70,15 +70,17 @@ namespace Learun.Application.OA.File.FileInfo
                 fileCondition = " AND F_FolderId = '0'";
             }
             strSql.Append(@"SELECT  *
-                            FROM    ( SELECT    F_FolderId AS F_FileId ,
+                            FROM    ( SELECT    a.F_FolderId AS F_FileId ,
                                                 F_ParentId AS F_FolderId ,
                                                 F_FolderName AS F_FileName ,
-                                                '' AS F_FileSize ,
+                                                b.filesize AS F_FileSize ,
                                                 'folder' AS F_FileType ,
-                                                F_CreateUserId,
+                                                a.F_CreateUserId,
                                                 F_ModifyDate,
                                                 F_IsShare 
-                                      FROM      LR_OA_FileFolder  where F_DeleteMark = 0");
+                                      FROM      LR_OA_FileFolder a ");
+            strSql.Append(" left join (select a.f_createuserid,a.f_folderid,sum(convert(float, f_filesize)) as filesize from adms7ultimate2_黑龙江艺术.dbo.LR_OA_FileInfo a  group by a.f_createuserid,a.f_folderid  having a.f_createuserid='System') b on b.f_folderid=a.f_folderid ");
+            strSql.Append(" where F_DeleteMark = 0 ");
             strSql.Append(folderCondition);
             strSql.Append(" UNION ");
             strSql.Append(@"SELECT              F_FileId ,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -449,6 +449,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi
                     }
                     UserEntity userbase = new UserEntity();
                     userbase.F_Account = tEntity.EmpNo;
+                    userbase.N_Account = tEntity.EmpNo;
                     userbase.F_RealName = tEntity.EmpName;
                     userbase.F_EnCode = tEntity.EmpNo;
                     userbase.F_Password = Md5Helper.Encrypt(defaultpwd, 32).ToLower();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util.Operat/OperatorHelper.cs

@@ -306,6 +306,7 @@ namespace Learun.Util.Operat
                             {
                                 userInfo.userId = userEntity.F_UserId;
                                 userInfo.enCode = userEntity.F_EnCode;
+                                userInfo.newenCode = userEntity.N_Account;
                                 userInfo.password = userEntity.F_Password;
                                 userInfo.secretkey = userEntity.F_Secretkey;
                                 userInfo.realName = userEntity.F_RealName;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/UserInfo.cs

@@ -23,6 +23,10 @@ namespace Learun.Util
         /// </summary>	
         public string enCode { get; set; }
         /// <summary>
+        /// 工号
+        /// </summary>	
+        public string newenCode { get; set; }
+        /// <summary>
         /// 账户
         /// </summary>	
         public string account { get; set; }