【修改】30天未修改密码提示增加开关显示配置；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachSwitch/Index.js

@@ -70,7 +70,7 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/TeachSwitch/GetPageList',
                 headData: [
                     {
-                        label: "开关名称", name: "type", width: 150, align: "left",
+                        label: "开关名称", name: "type", width: 300, align: "left",
                         formatter: function (val) {
                             if (val == 'js') {
                                 return '教师注册开关';
@@ -80,6 +80,8 @@ var bootstrap = function ($, learun) {
                                 return '网上办事大厅开关';
                             } else if (val == 'wxloginforpc') {
                                 return '微信快捷登录PC端';
+                            } else if (val == 'modifypwdtip') {
+                                return '30天未修改密码登录后提示修改';
                             }
 
                         }

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

@@ -571,21 +571,24 @@ namespace Learun.Application.Web.Controllers
                     return Success(new { pwd = true });
                 }
                 //是否30天未修改密码验证
-                //TODO：获取开关配置中“30天未修改密码进行提示”项的配置
-                if (userEntity.F_ModifyPwdDate.HasValue)
+                //获取开关显示配置中“30天未修改密码登录后提示修改”项的配置
+                if (teachSwitchIBLL.FindFirst("modifypwdtip"))
                 {
-                    if ((DateTime.Now-userEntity.F_ModifyPwdDate.Value).Days>30)
+                    if (userEntity.F_ModifyPwdDate.HasValue)
                     {
-                        return Success(new { pwdtip = true });
+                        if ((DateTime.Now-userEntity.F_ModifyPwdDate.Value).Days>30)
+                        {
+                            return Success(new { pwdtip = true });
+                        }
                     }
-                }
-                else
-                {
-                    if (userEntity.F_CreateDate.HasValue && (DateTime.Now-userEntity.F_CreateDate.Value).Days>30)
+                    else
                     {
-                        return Success(new { pwdtip=true });
+                        if (userEntity.F_CreateDate.HasValue && (DateTime.Now-userEntity.F_CreateDate.Value).Days>30)
+                        {
+                            return Success(new { pwdtip=true });
+                        }
                     }
-                }             
+                }
 
                 return Success("登录成功");
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js

@@ -228,7 +228,7 @@ var bootstrap = function ($, learun) {
             }
             //30天未修改密码进行提示
             if (pwdtip == "true") {
-                layer.alert("您已30天未修改密码，请先修改！", { title: "提示", yes: function (index) { layer.close(index) } });
+                layer.alert("您已30天未修改密码，请先修改！", {icon:7, title: "提示", yes: function (index) { layer.close(index) } });
             }
             //上网认证
             if (ACIp != null && ACIp != "") {