diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java
index 3c8e3b94c..29fff6b34 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java
@@ -104,6 +104,8 @@ public class SystemLogoConfig implements Serializable {
     private java.lang.Integer certificateExpireWarnAheadDay;
     @ApiModelProperty(value = "是否显示资料中心0不显示1显示")
     private java.lang.Integer showFileCenter;
+    @ApiModelProperty(value = "是否开启用户密码超期重置")
+    private java.lang.Integer enablePasswordReset;
     @TableField(exist = false)
     private java.lang.String fileStorageType;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index ea7a84ee2..b30b3b1a4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -382,6 +382,18 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                 result.put("sn", toCompanyProject.getSn());
                 SystemLogoConfig config = getSystemLogoConfig(toCompanyProject.getHeadquartersSn());
                 result.put("systemLogoConfig", config);
+                if (Objects.equals(config.getEnablePasswordReset(),1)) {
+                    //密码过期就返回userId，提示修改密码
+                    if (PwUtil.checkPwExpire(systemUser.getPwUpdateTime())) {
+                        HashMap<String, Object> m = new HashMap<>(16);
+                        m.put("expire", true);
+                        m.put("userId", systemUser.getUserId());
+                        m.put("account", systemUser.getAccount());
+                        m.put("msg", "需要修改密码");
+                        m.put("token", jwtTokenProvider.createToken(systemUser.getAccount(), 3600));
+                        return m;
+                    }
+                }
             }
             return result;
         } else {
@@ -439,6 +451,18 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                 companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
             }
             SystemLogoConfig slc = this.getSystemLogoConfig(companyConfig.getHeadquartersSn());
+            if (Objects.equals(slc.getEnablePasswordReset(),1)) {
+                //密码过期就返回userId，提示修改密码
+                if (PwUtil.checkPwExpire(systemUser.getPwUpdateTime())) {
+                    HashMap<String, Object> m = new HashMap<>(16);
+                    m.put("expire", true);
+                    m.put("userId", systemUser.getUserId());
+                    m.put("account", systemUser.getAccount());
+                    m.put("msg", "需要修改密码");
+                    m.put("token", jwtTokenProvider.createToken(systemUser.getAccount(), 3600));
+                    return m;
+                }
+            }
             String token = jwtTokenProvider.createToken(account, companyConfig.getEffectiveTime(), slc != null ? slc.getLoginTimeOut() : null);
             UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
             if (userEnterprise != null) {
@@ -1546,17 +1570,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                 }
             }
 
-            //密码过期就返回userId，提示修改密码
-            if (PwUtil.checkPwExpire(systemUser.getPwUpdateTime())) {
-                HashMap<String, Object> m = new HashMap<>(16);
-                m.put("expire", true);
-                m.put("userId", systemUser.getUserId());
-                m.put("account", systemUser.getAccount());
-                m.put("msg", "需要修改密码");
-                m.put("token", jwtTokenProvider.createToken(systemUser.getAccount(), 3600));
-                return m;
-            }
-
             authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account, systemUser.getShowPassword()));
 
             return doLogin(map, systemUser);