'commit'

dsBase/src/main/java/com/dsideal/dsBase/Base/Model/BaseModel.java

@@ -418,21 +418,18 @@ public class BaseModel {
     public Map getLoginInfoByUserName(String userName) {
         Map<String, Object> loginMap = new HashMap<>();
         String sql = Db.getSql("Base.getLoginInfoByUserName");
-        List<Record> list = Db.find(sql, userName);
-        if (list.size() > 0) {
-            String person_id = list.get(0).get("person_id").toString();
-            loginMap.put("person_id", person_id);
-            loginMap.put("person_name", list.get(0).get("person_name").toString());
-            loginMap.put("identity_id", list.get(0).get("identity_id").toString());
-            loginMap.put("bureau_id", list.get(0).get("bureau_id").toString());
-            loginMap.put("password", list.get(0).get("pwd").toString());
-            loginMap.put("city_id", list.get(0).get("city_id").toString());
-            loginMap.put("area_id", list.get(0).get("area_id").toString());
-            loginMap.put("org_code", getOrgCodeByPersonId(person_id));
-            return loginMap;
-        } else {
-            return null;
-        }
+        Record r = Db.findFirst(sql, userName);
+        if (r == null) return null;
+        String person_id = r.get("person_id").toString();
+        loginMap.put("person_id", person_id);
+        loginMap.put("person_name", r.get("person_name").toString());
+        loginMap.put("identity_id", r.get("identity_id").toString());
+        loginMap.put("bureau_id", r.get("bureau_id").toString());
+        loginMap.put("password", r.get("pwd").toString());
+        loginMap.put("city_id", r.get("city_id").toString());
+        loginMap.put("area_id", r.get("area_id").toString());
+        loginMap.put("org_code", getOrgCodeByPersonId(person_id));
+        return loginMap;
     }
 
     /**

dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java

@@ -129,7 +129,7 @@ public class LoginPersonController extends Controller {
         String passwordEncode = CommonUtil.getLdapPassword(password);
         BaseModel bm = new BaseModel();
         Map loginMap = bm.getLoginInfoByUserName(username);
-        if (loginMap == null || !passwordEncode.equals(loginMap.get("password").toString())) {
+        if (passwordEncode != null && (loginMap == null || !passwordEncode.equals(loginMap.get("password").toString()))) {
             //扩展支持连续输入用户名密码错误，停用账号5分钟功能 2022.06.07
             cntNum = 1;
             if (RedisKit.Exists(PassWordKey))
@@ -159,7 +159,7 @@ public class LoginPersonController extends Controller {
         RedisKit.Del(PassWordKey);
         RedisKit.Del(checkCodeKey);
 
-        //检查当前人员是不是存在合理角色
+        //检查当前人员是不是存在合理身份
         int identity_id = Integer.parseInt(loginMap.get("identity_id").toString());
         String person_id = loginMap.get("person_id").toString();
         if (identity_id == 5 || identity_id == 6) {
@@ -172,7 +172,7 @@ public class LoginPersonController extends Controller {
                 return;
             }
         }
-
+        //写入Session信息
         SessionKit.set(getRequest(), getResponse(), "identity_id", loginMap.get("identity_id").toString());
         SessionKit.set(getRequest(), getResponse(), "person_id", loginMap.get("person_id").toString());
         SessionKit.set(getRequest(), getResponse(), "bureau_id", loginMap.get("bureau_id").toString());
@@ -180,6 +180,7 @@ public class LoginPersonController extends Controller {
         SessionKit.set(getRequest(), getResponse(), "city_id", loginMap.get("city_id").toString());
         SessionKit.set(getRequest(), getResponse(), "area_id", loginMap.get("area_id").toString());
 
+        //返回相关信息
         resultJson.put("success", true);
         resultJson.put("identity_id", loginMap.get("identity_id").toString());
         resultJson.put("person_id", loginMap.get("person_id").toString());
@@ -187,8 +188,7 @@ public class LoginPersonController extends Controller {
         resultJson.put("person_name", loginMap.get("person_name").toString());
         resultJson.put("org_code", loginMap.get("org_code").toString());
 
-
-        //根据人员id,获取所有单位信息
+        //根据人员id,获取所在单位信息
         Record r = bm.getBureauInfoByPersonId(loginMap.get("person_id").toString());
         if (r != null) resultJson.put("bureau_name", r.getStr("bureau_name"));
         renderJson(resultJson);

dsBase/src/main/java/com/dsideal/dsBase/Util/SessionKit.java

@@ -1,7 +1,5 @@
 package com.dsideal.dsBase.Util;
 
-import com.jfinal.kit.PropKit;
-
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -81,7 +79,6 @@ public class SessionKit {
      */
     public static String get(HttpServletRequest request, HttpServletResponse response, String key) {
         String jSessionId = getCookieSessionId(request, response);
-        if (jSessionId == null) return null;
         String value = RedisKit.HGet(jSessionId, key);
         //过期时长为TimeoutSecond
         RedisKit.Expire(jSessionId, TimeoutSecond);