From e657e9909401a964c3a44bddb190b385f2eaae91 Mon Sep 17 00:00:00 2001
From: MrZhai <zrhdyxa@163.com>
Date: Fri, 1 Apr 2022 09:16:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E5=85=AC=E5=8F=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=87=8C=E6=80=BB=E9=83=A8=E4=BF=A1=E6=81=AF=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=202.=E5=AE=A2=E6=88=B7=E7=8A=B6=E6=80=81=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=9C=AA=E9=AA=8C=E8=AF=81=E7=8A=B6=E6=80=81=E5=80=BC?=
 =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/udi/admin/controller/auth/LoginController.java | 6 ------
 .../java/com/glxp/udi/admin/entity/info/CompanyEntity.java  | 1 -
 .../src/main/resources/mybatis/mapper/info/CompanyDao.xml   | 6 +-----
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java
index 995ff7e..76d8ae1 100644
--- a/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java
+++ b/api-udims/src/main/java/com/glxp/udi/admin/controller/auth/LoginController.java
@@ -78,9 +78,6 @@ public class LoginController {
                 if (authAdmin.getUserFlag() == 0) {
                     throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！");
                 }
-                if (authAdmin.getUserFlag() == 2) {
-                    throw new JsonException(ResultEnum.DATA_NOT, "该用户未验证！");
-                }
                 CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(authAdmin.getCustomerId());
                 if (customerInfoEntity.getUserFlag() == 0) {
                     throw new JsonException(ResultEnum.DATA_NOT, "该企业账户已被禁用！");
@@ -89,9 +86,6 @@ public class LoginController {
                 if (authAdmin.getUserFlag() == 0) {
                     throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！");
                 }
-                if (authAdmin.getUserFlag() == 2) {
-                    throw new JsonException(ResultEnum.DATA_NOT, "该用户未验证！");
-                }
             }
         }
         if (authAdmin == null) {
diff --git a/api-udims/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java b/api-udims/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java
index d72184f..7cc0b77 100644
--- a/api-udims/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java
+++ b/api-udims/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java
@@ -28,7 +28,6 @@ public class CompanyEntity {
     private int networkType;
     private int certIdFk;
 
-    private String parentCompany;
     private String parentIdFk;
 
     private String contactsPapersType;
diff --git a/api-udims/src/main/resources/mybatis/mapper/info/CompanyDao.xml b/api-udims/src/main/resources/mybatis/mapper/info/CompanyDao.xml
index dccfce1..95b7e42 100644
--- a/api-udims/src/main/resources/mybatis/mapper/info/CompanyDao.xml
+++ b/api-udims/src/main/resources/mybatis/mapper/info/CompanyDao.xml
@@ -156,9 +156,6 @@
             <if test="areaCode != null">
                 areaCode=#{areaCode},
             </if>
-            <if test="parentCompany != null">
-                parentCompany=#{parentCompany},
-            </if>
             <if test="parentIdFk != null">
                 parentIdFk=#{parentIdFk},
             </if>
@@ -223,7 +220,7 @@
     <insert id="insertCompany" parameterType="com.glxp.udi.admin.entity.info.CompanyEntity">
         INSERT INTO company(companyName, bussinessStatus, creditNum, classes, area,
         detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode,
-        refEntId, entId, networkType, certIdFk, parentCompany, parentIdFk,
+        refEntId, entId, networkType, certIdFk, parentIdFk,
         contactsPapersType, contactsPapersCode, registerStatus, jyxkzh, jyxkzfzjg, jyxkzyxq,
         jybapzh, jybabm, fzrq, suihao, kaihuhang, kaihuzhanghao, auditStatus,
         filePath, filePath2, filePath3, filePath4, unitIdFk)
@@ -245,7 +242,6 @@
         #{entId},
         #{networkType},
         #{certIdFk},
-        #{parentCompany},
         #{parentIdFk},
         #{contactsPapersType},
         #{contactsPapersCode},