Commit 1cd3e548d4a32529ca3d4cad6fbef1084b4fc22a

Authored by wangqian
1 parent c046ba5d

工单查询增加业务线

urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
@@ -24,20 +24,16 @@ public interface MainInfoMapper extends BaseMapperX<MainInfoDO> { @@ -24,20 +24,16 @@ public interface MainInfoMapper extends BaseMapperX<MainInfoDO> {
24 24
25 LambdaQueryWrapperX<MainInfoDO> queryWrapper = new LambdaQueryWrapperX<>(); 25 LambdaQueryWrapperX<MainInfoDO> queryWrapper = new LambdaQueryWrapperX<>();
26 String[] busiLineArr = reqVO.getBusiLine().split(","); 26 String[] busiLineArr = reqVO.getBusiLine().split(",");
27 - if (busiLineArr != null && busiLineArr.length > 1) {  
28 - // 拼接 OR 条件:FIND_IN_SET(a, busi_line) > 0 OR FIND_IN_SET(c, busi_line) > 0  
29 - for (int i = 0; i < busiLineArr.length; i++) {  
30 - String val = busiLineArr[i].trim();  
31 - if (StringUtils.hasText(val)) {  
32 - if (i == 0) {  
33 - queryWrapper.apply("FIND_IN_SET({0}, busi_line) > 0", val);  
34 - } else {  
35 - queryWrapper.or().apply("FIND_IN_SET({0}, busi_line) > 0", val);  
36 - } 27 + // 拼接 OR 条件:FIND_IN_SET(a, busi_line) > 0 OR FIND_IN_SET(c, busi_line) > 0
  28 + for (int i = 0; i < busiLineArr.length; i++) {
  29 + String val = busiLineArr[i].trim();
  30 + if (StringUtils.hasText(val)) {
  31 + if (i == 0) {
  32 + queryWrapper.apply("FIND_IN_SET({0}, busi_line) > 0", val);
  33 + } else {
  34 + queryWrapper.or().apply("FIND_IN_SET({0}, busi_line) > 0", val);
37 } 35 }
38 } 36 }
39 - } else {  
40 - queryWrapper.likeIfPresent(MainInfoDO::getBusiLine, reqVO.getBusiLine());  
41 } 37 }
42 queryWrapper.eqIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo()) 38 queryWrapper.eqIfPresent(MainInfoDO::getOrderNo, reqVO.getOrderNo())
43 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName()) 39 .likeIfPresent(MainInfoDO::getOrderName, reqVO.getOrderName())