fanxw 1 kuukausi sitten
vanhempi
commit
cbc40c84cb

+ 4 - 3
src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -353,9 +353,10 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
353 353
 		} else {//油罐的
354 354
 			BasicTankExample example = new BasicTankExample();
355 355
 			BasicTankExample.Criteria criteria = example.createCriteria();
356
-			criteria.andIdEqualTo(sptDataId);
357
-			BasicTank basicTank = bankMapper.selectByPrimaryKey(sptDataId);
358
-			if(null != basicTank){
356
+			criteria.andSptDataidEqualTo(sptDataId);
357
+			List<BasicTank> list = bankMapper.selectByExample(example);
358
+			if(null != list && list.size() > 0){
359
+				BasicTank basicTank = list.get(0);
359 360
 				houseId = Integer.parseInt(basicTank.getId());
360 361
 				wareHouseId = houseId;
361 362
 				orgId = basicTank.getOrgId();

+ 4 - 3
src/main/resources/bootstrap.yml

@@ -26,8 +26,6 @@ mybatis:
26 26
 management:
27 27
   server:
28 28
     port: -1
29
-  #endpoints:
30
-    #enabled-by-default: false
31 29
 
32 30
 spring:
33 31
   application:
@@ -77,7 +75,10 @@ spring:
77 75
       enabled: true
78 76
       max-file-size: 50MB
79 77
       max-request-size: 100MB
80
-      #location: /home/uploadTmp
78
+  #文件临时存储路径
79
+  http:
80
+    multipart:
81
+      location: /home/depot-web/uploadTmp
81 82
 
82 83
 cxf:
83 84
   path: /depotbasic