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

bug修改

Browse Source
This commit is contained in:
joylink_zhangsai 2020-11-19 19:20:50 +08:00
parent cfa404807c
commit 5552022eb8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/club/joylink/rtss/services/CommandService.java
View File

@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@ -52,11 +53,11 @@ public class CommandService implements ICommandService {
CommandDefinitionExample commandDefinitionExample = new CommandDefinitionExample();
CommandDefinitionExample.Criteria criteria = commandDefinitionExample.createCriteria();
//条件：线路
if (!lineCode.isEmpty()) {
if (!StringUtils.isEmpty(lineCode)) {
criteria.andLineCodeEqualTo(lineCode);
}
//条件：操作对象
if (!queryVO.getOperateObject().isEmpty()) {
if (!StringUtils.isEmpty(queryVO.getOperateObject())) {
criteria.andOperateObjectEqualTo(queryVO.getOperateObject());
}
@ -86,14 +87,14 @@ public class CommandService implements ICommandService {
//条件：线路
CommandDefinitionExample commandDefinitionExample = new CommandDefinitionExample();
if (!lineCode.isEmpty()) {
if (!StringUtils.isEmpty(lineCode)) {
CommandDefinitionExample.Criteria criteria = commandDefinitionExample.createCriteria();
criteria.andLineCodeEqualTo(lineCode);
if (!simulationRole.isEmpty()) {
if (!StringUtils.isEmpty(simulationRole)) {
//+操作对象过滤
criteria.andSimulationRoleEqualTo(simulationRole);
}
if (!prdType.isEmpty()) {
if (!StringUtils.isEmpty(prdType)) {
criteria.andPrdTypeEqualTo(prdType);
}