no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -626,7 +626,7 @@ public class AdminUserLogic {
             final List<AdminUserWebsitRela> adminUserList = adminUserWebsitRelaService.lambdaQuery()
                     .select(AdminUserWebsitRela::getAdminUserId)
                     .eq(AdminUserWebsitRela::getCompanyWechatId, adminUser.getCompanyWechatId())
-                    .eq(AdminUserWebsitRela::getAdminWebsitId, adminUser.getAdminWebsitIds())
+                    .in(AdminUserWebsitRela::getAdminWebsitId, adminUser.getAdminWebsitIds())
                     .list();
             if (CollectionUtil.isNotEmpty(adminUserList)) {
                 final List<AdminUser> userList = adminUserService.lambdaQuery()

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -119,7 +119,8 @@ public class WebsitContractSignLogic {
         AdminWebsit websit = adminWebsitService.getById(record.getWebsitId());
 
         // 未企业认证
-        if (StringUtils.isBlank(websit.getFadadaWebsitNo()) && StringUtils.isBlank(websit.getFadadaWebsitId())) {
+        if (StringUtils.isBlank(websit.getFadadaWebsitNo()) && StringUtils.isBlank(websit.getFadadaWebsitId())
+                || StringUtils.isBlank(websit.getFadadaWebsitNo()) && StringUtils.isNotBlank(websit.getFadadaWebsitId())) {
             this.companyAuthMethod(websit, bean, returnUrl);
         }
 
@@ -318,9 +319,9 @@ public class WebsitContractSignLogic {
             } else if (field.getFieldType().equals(FieldTypeEnum.Y_ADDRESS.getKey())) {
                 String address = Optional.ofNullable(websit.getAddress()).orElse("");
                 String execAddress = address;
-                if (address.length() > 14) {
-                    execAddress = address.substring(0, 14) + "\n" + address.substring(14, address.length() - 1);
-                }
+//                if (address.length() > 14) {
+//                    execAddress = address.substring(0, 14) + "\n" + address.substring(14, address.length() - 1);
+//                }
                 params.set(field.getFieldName(), execAddress);
 
             } else if (field.getFieldType().equals(FieldTypeEnum.Y_TEL.getKey())) {
@@ -350,9 +351,9 @@ public class WebsitContractSignLogic {
             } else if (field.getFieldType().equals(FieldTypeEnum.ADDRESS.getKey())) {
                 String address = Optional.ofNullable(companyCaAuth.getCompanyAddress()).orElse("");
                 String execAddress = address;
-                if (address.length() > 14) {
-                    execAddress = address.substring(0, 14) + "\n" + address.substring(14, address.length() - 1);
-                }
+//                if (address.length() > 14) {
+//                    execAddress = address.substring(0, 14) + "\n" + address.substring(14, address.length() - 1);
+//                }
                 params.set(field.getFieldName(), execAddress);
 
             } else if (field.getFieldType().equals(FieldTypeEnum.TEL.getKey())) {