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 @@ areaCode=#{areaCode}, - - parentCompany=#{parentCompany}, - parentIdFk=#{parentIdFk}, @@ -223,7 +220,7 @@ 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},