@@ -6,7 +6,7 @@
<groupId>org.example</groupId>
<artifactId>dil-rms-api</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -43,6 +43,7 @@ public class RmsDirectlySentCityController extends BaseRESTfulController {
if (con != null && !"null".equals(con) && !"".equals(con)){
mapValue.put("con",con);
}
+
PageHelper.startPage(pageNum, pageSize);
//分页查询数据
List<Map<String, Object>> columnList = rmsDirectlySentCityService.getDirectlySentCity(mapValue);
@@ -507,9 +507,12 @@
RDSC.PRIMARY_KEY_ID "primaryKeyId"
FROM RMS_DIRECTLY_SENT_CITY RDSC
LEFT JOIN RMS_CARRIER RC ON RC.CARRIER_ID = RDSC.CARRIER_ID
- <if test="con != null">
+ <if test="flag == null and con != null">
WHERE RDSC.DIRECTLY_SENT_NAME = #{con}
</if>
+ <if test="flag != null and con != null">
+ WHERE RDSC.DIRECTLY_SENT_NAME like '%${con}%'
+ </if>
</select>
<select id="selectAddressId" resultType="java.math.BigDecimal">
@@ -1,5 +1,5 @@
## LOG4J配置
-log4j.rootCategory=INFO,file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file, RUNNING,errorfile
## 控制台输出
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout