joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
walker-sheng 2021-03-22 11:23:58 +08:00
commit b26ef44213
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/dao/RunPlanRoutingDAO.java
View File

@ -46,7 +46,7 @@ public interface RunPlanRoutingDAO {
"AND user_id IS NULL " +
"</if> " +
"<if test=\"userId != null\">\n" +
"AND (user_id IS NULL OR user_id = #{userId})\n" +
"AND user_id = #{userId}\n" +
"</if> " +
"AND section_data = #{sectionData} " +
"</script>")

1
src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java
View File

@ -234,6 +234,7 @@ public class RunPlanRoutingService implements IRunPlanRoutingService {
RunPlanRouting routing = getRunPlanRoutingData(routingId);
if(Objects.equals(routing.getSectionData(),JsonUtils.writeValueAsString(routingVO.getParkSectionCodeList()))){
runPlanRoutingDAO.updateByPrimaryKey(newRouting);
return;
}
BusinessExceptionAssertEnum.DATA_ALREADY_EXIST.assertNotTrue(routingDataExist(routingVO), "交路数据重复");
runPlanRoutingDAO.updateByPrimaryKeyWithBLOBs(newRouting);