CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: CC:7b576cf85cbe0b5312ecf59708063c5486b7846e
Branches Tags
CC:master
..
compare: CC:0f02a868205f6a8451e27e3d6a6e91034d3ffb26
Branches Tags
CC:master

2 Commits
7b576cf85c ... 0f02a86820

Author SHA1 Message Date
荒
0f02a86820 1 2025-10-05 02:31:40 +08:00
荒
fe622b9648 1 2025-10-05 02:25:01 +08:00
2 changed files with 3 additions and 1 deletions
Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
View File

@@ -391,7 +391,7 @@ public class InstructionServiceImpl implements IInstructionService {
address.append(phone); address.append(phone);
System.out.println(address); System.out.println(address);
for (int i = 4; i < parts.length; i++) { for (int i = 4; i < parts.length; i++) {
address.append(parts[i]); address.append(parts[i]);F
} }
String jf = productWithJF.get(modelNumber); String jf = productWithJF.get(modelNumber);

2
ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml
View File

@@ -121,6 +121,8 @@
<if test="itemId != null and itemId != ''"> and item_id = #{itemId}</if> <if test="itemId != null and itemId != ''"> and item_id = #{itemId}</if>
<if test="callerItemId != null and callerItemId != ''"> and caller_item_id = #{callerItemId}</if> <if test="callerItemId != null and callerItemId != ''"> and caller_item_id = #{callerItemId}</if>
<if test="orderTag != null and orderTag != ''"> and order_tag = #{orderTag}</if> <if test="orderTag != null and orderTag != ''"> and order_tag = #{orderTag}</if>
<if test="params.beginTime != null"> and order_time &gt;= #{params.beginTime}</if>
<if test="params.endTime != null"> and order_time &lt;= #{params.endTime}</if>
</where> </where>
order by order_time desc order by order_time desc
</select> </select>