change 4 лет назад
Родитель
Сommit
7a2fc60a9b

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -167,7 +167,7 @@ public class OssServiceImpl implements OssService {
             //第三个参数  上传文件输入流
              PutObjectResult putObjectResult = ossClient.putObject(ALIYUN_OSS_BUCKET_NAME, fileName, inputStream);
              // 关闭OSSClient。
-            ossClient.shutdown();
+            //ossClient.shutdown();
 
                 System.out.println(fileName);
             return fileName;

+ 8 - 4
zhongzheng-system/src/main/java/com/zhongzheng/modules/company/service/impl/CompanyServiceImpl.java

@@ -159,6 +159,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         Long nowTime = DateUtils.getNowTime();
         for (int i = 0; i < readAll.size(); i++) {
             Company company = new Company();
+            if(readAll.get(i).get(0).toString().equals("****公司")){
+                continue;
+            }
             company.setCompanyName(readAll.get(i).get(0).toString());
             LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
             Long sysDictData = dictDataService.selectDictLabelType("company_type",readAll.get(i).get(1).toString());
@@ -181,10 +184,11 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             company.setSocietyCode(readAll.get(i).get(5).toString());
             company.setProvince(readAll.get(i).get(6).toString());
             company.setCity(readAll.get(i).get(7).toString());
-            company.setAddress(readAll.get(i).get(8).toString());
-            company.setCompanyPh(readAll.get(i).get(9).toString());
-            company.setLinkMan(readAll.get(i).get(10).toString());
-            company.setPostBox(readAll.get(i).get(11).toString());
+            company.setDistrict(readAll.get(i).get(8).toString());
+            company.setAddress(readAll.get(i).get(9).toString());
+            company.setCompanyPh(readAll.get(i).get(10).toString());
+            company.setLinkMan(readAll.get(i).get(11).toString());
+            company.setPostBox(readAll.get(i).get(12).toString());
             company.setTenantId(Convert.toLong(TenantId));
             company.setCreateTime(nowTime);
             company.setUpdateTime(nowTime);