文档管理修复

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.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.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; }