同步数据修改

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

@@ -243,8 +243,8 @@ namespace Learun.Application.Organization
         /// <summary>
         /// 是否已登录标记
         /// </summary>	
-        [Column("F_HAVELOGMARK")]
-        public bool? F_HaveLogMark { get; set; }
+        //[Column("F_HAVELOGMARK")]
+        //public bool? F_HaveLogMark { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs

@@ -603,7 +603,7 @@ namespace Learun.Application.Web.Controllers
             else
             {
                 //记录已登录标记
-                userBll.UpdateHaveLogMark(userEntity.F_UserId);
+                //userBll.UpdateHaveLogMark(userEntity.F_UserId);
                 //记录ip
                 userBll.UpdateIp(GetIP(), userEntity.F_UserId);
                 OperatorHelper.Instance.AddLoginUser(userEntity.F_Account, "Learun_ADMS_6.1_PC", null);//写入缓存信息
@@ -1250,7 +1250,7 @@ namespace Learun.Application.Web.Controllers
             {
                 return Fail("输入错误!");
             }
-            if (codeType == "firstlogin" && userEntity.F_HaveLogMark == true)
+            if (codeType == "firstlogin")
             {
                 return Fail("当前用户非首次登录，请使用账号密码进行登录!");
             }
@@ -1356,10 +1356,10 @@ namespace Learun.Application.Web.Controllers
                 {
                     return Fail("账户被系统锁定,请联系管理员!");
                 }
-                if (userEntity.F_HaveLogMark == true)
-                {
-                    return Fail("当前用户非首次登录，请使用账号密码进行登录!");
-                }
+                //if (userEntity.F_HaveLogMark == true)
+                //{
+                //    return Fail("当前用户非首次登录，请使用账号密码进行登录!");
+                //}
                 userEntity.LoginOk = true;
                 #region  写入日志
                 LogEntity logEntity = new LogEntity();

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs

@@ -2061,7 +2061,7 @@ namespace Learun.Application.Web.Controllers
             {
                 return Fail("输入错误!");
             }
-            if (codeType == "firstlogin" && userEntity.F_HaveLogMark == true)
+            if (codeType == "firstlogin")
             {
                 return Fail("当前用户非首次登录，请使用账号密码进行登录!");
             }
@@ -2167,10 +2167,10 @@ namespace Learun.Application.Web.Controllers
                 {
                     return Fail("账户被系统锁定,请联系管理员!");
                 }
-                if (userEntity.F_HaveLogMark == true)
-                {
-                    return Fail("当前用户非首次登录，请使用账号密码进行登录!");
-                }
+                //if (userEntity.F_HaveLogMark == true)
+                //{
+                //    return Fail("当前用户非首次登录，请使用账号密码进行登录!");
+                //}
                 userEntity.LoginOk = true;
                 #region  写入日志
                 LogEntity logEntity = new LogEntity();

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs

@@ -343,10 +343,10 @@ namespace Learun.Application.WebApi
                 {
                     return Fail("账户被系统锁定,请联系管理员!");
                 }
-                if (userEntity.F_HaveLogMark == true)
-                {
-                    return Fail("当前用户非首次登录，请使用账号密码进行登录!");
-                }
+                //if (userEntity.F_HaveLogMark == true)
+                //{
+                //    return Fail("当前用户非首次登录，请使用账号密码进行登录!");
+                //}
                 userEntity.LoginOk = true;
 
                 #region 写入日志

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UsernologinApi.cs

@@ -108,7 +108,7 @@ namespace Learun.Application.WebApi
             {
                 return Fail("输入错误!");
             }
-            if (loginModel.codeType == "firstlogin" && userEntity.F_HaveLogMark == true)
+            if (loginModel.codeType == "firstlogin")
             {
                 return Fail("当前用户非首次登录，请使用账号密码进行登录!");
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemDetailEntity.cs

@@ -128,42 +128,46 @@ namespace Learun.Application.Base.SystemModule
         /// <returns></returns>
         [Column("F_MODIFYUSERNAME")]
         public string F_ModifyUserName { get; set; }
+
+
+        [Column("F_ITEMCODEGB")]
+        public string F_ItemCodeGB { get; set; }
         /// <summary>
         /// 类型
         /// </summary>
         /// <returns></returns>
-        [Column("F_TYPE")]
-        public string F_Type { get; set; }
+        //[Column("F_TYPE")]
+        //public string F_Type { get; set; }
         /// <summary>
         /// 长度
         /// </summary>
         /// <returns></returns>
-        [Column("F_LENGTH")]
-        public string F_Length { get; set; }
+        //[Column("F_LENGTH")]
+        //public string F_Length { get; set; }
         /// <summary>
         /// 约束
         /// </summary>
         /// <returns></returns>
-        [Column("F_CONSTRAINT")]
-        public string F_Constraint { get; set; }
+        //[Column("F_CONSTRAINT")]
+        //public string F_Constraint { get; set; }
         /// <summary>
         /// 值空间
         /// </summary>
         /// <returns></returns>
-        [Column("F_VALUESPACE")]
-        public string F_ValueSpace { get; set; }
+        //[Column("F_VALUESPACE")]
+        //public string F_ValueSpace { get; set; }
         /// <summary>
         /// 解释举例
         /// </summary>
         /// <returns></returns>
-        [Column("F_EXPLAIN")]
-        public string F_Explain { get; set; }
+        //[Column("F_EXPLAIN")]
+        //public string F_Explain { get; set; }
         /// <summary>
         /// 引用编号
         /// </summary>
         /// <returns></returns>
-        [Column("F_REFERENCENUM")]
-        public string F_ReferenceNum { get; set; }
+        //[Column("F_REFERENCENUM")]
+        //public string F_ReferenceNum { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs

@@ -57,8 +57,7 @@ namespace Learun.Application.Base.SystemModule
                     t.F_CreateUserName,
                     t.F_ModifyDate,
                     t.F_ModifyUserId,
-                    t.F_ModifyUserName,
-t.F_Type,t.F_Length,t.F_Constraint,t.F_ValueSpace,t.F_Explain,t.F_ReferenceNum
+                    t.F_ModifyUserName
                     ";
         }
         #endregion