Redeem 1 năm trước cách đây
mục cha
commit
733496c42e

+ 1 - 1
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -701,7 +701,7 @@ public class TMSController extends BaseRESTfulController {
                                                        Integer apiId,
                                                        Integer pageNum,
                                                        Integer pageSize) {
-        return tmsFeign.getDriverTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+        return tmsFeign.getCapacityTotalResult(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
     }
 
 

+ 2 - 2
src/main/resources/bootstrap.yml

@@ -51,5 +51,5 @@ mybatis:
 filePath: /data/file
 #前缀
 prefix:
-  logPrefix: http://172.16.90.214/data/antai-api/logs/log/running.log.
-  filePrefix: http://172.16.90.214
+  logPrefix: http://172.16.90.202/data/antai-api/logs/log/running.log.
+  filePrefix: http://172.16.90.202

+ 1 - 3
src/main/resources/com/steerinfo/dil/mapper/CommonMapper.xml

@@ -14,9 +14,7 @@
     </sql>
     <sql id="rootCompanyFilter">
         <if test="rootCompanyMap != null and urlFlag != null and urlFlag != 'null' and urlFlag != ''">
-            AND ("rootCompanyId" = #{rootCompanyMap.rootCompanyId}
-            OR  #{urlFlag} = (SELECT IS_LISTED FROM RMS_COMPANY WHERE COMPANY_ID = "rootCompanyId")
-            )
+            AND   #{urlFlag} = (SELECT IS_LISTED FROM RMS_COMPANY WHERE COMPANY_ID = "rootCompanyId")
         </if>
     </sql>
     <sql id="filterCompanyData">