Procházet zdrojové kódy

crm单点登录自动解锁
yos缓存表实现方案调整

shenjingwei před 1 měsícem
rodič
revize
3497deecc0
2 změnil soubory, kde provedl 9 přidání a 12 odebrání
  1. 1 1
      pom.xml
  2. 8 11
      src/custom/common/crm/sso.java

+ 1 - 1
pom.xml

@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.yunlian.yos</groupId>
             <artifactId>yos-core</artifactId>
-            <version>3.4.6</version>
+            <version>3.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>

+ 8 - 11
src/custom/common/crm/sso.java

@@ -80,17 +80,14 @@ public class sso extends Basic {
                 Row user = users.get(0);
                 String status = user.getString("status");
                 long userid = user.getLong("userid");
-                if (status.equalsIgnoreCase("ACTIVE")) {
-                    Rows br_hrRows = new DBConnect("CRM").runSqlQuery("select fagent_num,phone,name from br_hr where hrid='" + accountno + "' and fagent_num!='meida'");
-                    if (br_hrRows.isNotEmpty()) {
-                        String phone = br_hrRows.get(0).getString("phone");
-                        String name = br_hrRows.get(0).getString("name");
-                        passwordVerificationPassed = updateAgentUser(connect, userid, accountno, name, phone);//检查更新账号权限
-                    }
-                } else if (status.equalsIgnoreCase("INACTIVE")) {
-                    errmsg = "账号已被锁定";
-                } else {
-                    errmsg = "账号状态异常";
+                if (!status.equalsIgnoreCase("ACTIVE")) {
+                    connect.runSqlUpdate("update sys_users set failedlogins=0,status='ACTIVE' where userid=" + userid);
+                }
+                Rows br_hrRows = new DBConnect("CRM").runSqlQuery("select fagent_num,phone,name from br_hr where hrid='" + accountno + "' and fagent_num!='meida'");
+                if (br_hrRows.isNotEmpty()) {
+                    String phone = br_hrRows.get(0).getString("phone");
+                    String name = br_hrRows.get(0).getString("name");
+                    passwordVerificationPassed = updateAgentUser(connect, userid, accountno, name, phone);//检查更新账号权限
                 }
             } else {
                 //账号不存在,则查询crm账号,并在E-订单中创建并授权