Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

ie-admin/src/main/java/com/ruoyi/web/controller/front/UserController.java

@@ -11,6 +11,7 @@ import com.ruoyi.common.core.domain.model.LoginCard;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.AccessFromType;
+import com.ruoyi.common.enums.AccountType;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.utils.NumberUtils;
@@ -244,16 +245,19 @@ public class UserController extends BaseController {
             com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(appConfig);
             ajax.put("appConfig", json);
         }
+
+        if (null!=user.getCardId()){
+            user.setAccountType(AccountType.common.getValue());
+        }else {
+            user.setAccountType(AccountType.audit.getValue());
+        }
+
         //处理accountType。1正常，2审核账号 user.data.accountType=2
         String auditAccount = configService.selectConfigByKey("audit.account");
         if (StringUtils.isNotBlank(auditAccount)){
             if (auditAccount.contains(user.getPhonenumber())||auditAccount.contains(user.getUserName())){
-                user.setAccountType(2);
-            }else {
-                user.setAccountType(1);
+                user.setAccountType(AccountType.audit.getValue());
             }
-        }else {
-            user.setAccountType(1);
         }
 
         return ajax;

ie-common/src/main/java/com/ruoyi/common/enums/AccountType.java

@@ -0,0 +1,98 @@
+package com.ruoyi.common.enums;
+
+import com.ruoyi.common.utils.StringUtils;
+
+public enum AccountType {
+    common(1, "普通账号"),
+    audit(2, "审核账号"),
+
+    ;
+
+    private Integer value;
+    private String remark;
+
+    private AccountType(Integer value, String remark) {
+        this.value = value;
+        this.remark = remark;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public static AccountType getByValue(String value) {
+        for (AccountType o : AccountType.values()) {
+            if (o.getValue().equals(value)) {
+                return o;
+            }
+        }
+        return null;
+    }
+
+
+    public static Boolean isAudit(Object value) {
+        if(StringUtils.isNull(value)){
+            return false;
+        }
+
+        if(value instanceof String){
+            if (audit.name().equalsIgnoreCase(String.valueOf(value).trim())) {
+                return true;
+            }
+            if ((audit.name()+":").equalsIgnoreCase(String.valueOf(value).trim())) {
+                return true;
+            }
+        }
+
+        if(value instanceof Long){
+            if (audit.getValue().intValue()==Integer.valueOf(String.valueOf(value).trim()).intValue()) {
+                return true;
+            }
+        }
+
+        if(value instanceof Integer){
+            if (audit.getValue().intValue()==Integer.valueOf(String.valueOf(value).trim()).intValue()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static Boolean isCommon(Object value) {
+        if(StringUtils.isNull(value)){
+            return false;
+        }
+        if(value instanceof String){
+            if (common.name().equalsIgnoreCase(String.valueOf(value).trim())) {
+                return true;
+            }
+            if ((common.name()+":").equalsIgnoreCase(String.valueOf(value).trim())) {
+                return true;
+            }
+        }
+
+        if(value instanceof Long){
+            if (common.getValue().intValue()==Integer.valueOf(String.valueOf(value).trim()).intValue()) {
+                return true;
+            }
+        }
+
+        if(value instanceof Integer){
+            if (common.getValue().intValue()==Integer.valueOf(String.valueOf(value).trim()).intValue()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    public static void main(String[] args) {
+
+    }
+}