fix:

1.服务范围规划列表查询逻辑更改
2.枚举类转化

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBServiceServiceImpl.java

@@ -109,7 +109,7 @@ public class TBServiceServiceImpl extends ServiceImpl<TBServiceMapper, TBService
         }
         ServiceStatusEnum status = tbService.getStatus();
         if (!ServiceStatusEnum.NEW.equals(status)) {
-            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被删除，当前状态[%s]", ServiceStatusEnum.NEW, status));
+            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被删除，当前状态[%s]", ServiceStatusEnum.NEW.getTitle(), status.getTitle()));
         }
         tbService.setStatus(ServiceStatusEnum.CANCEL);
         tbService.setEnable(false);
@@ -125,7 +125,7 @@ public class TBServiceServiceImpl extends ServiceImpl<TBServiceMapper, TBService
         }
         ServiceStatusEnum status = tbService.getStatus();
         if (!ServiceStatusEnum.NEW.equals(status) && ServiceStatusEnum.FINISH.equals(status)) {
-            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被发布，当前状态[%s]", ServiceStatusEnum.NEW + "或" + ServiceStatusEnum.FINISH, status));
+            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被发布，当前状态[%s]", ServiceStatusEnum.NEW.getTitle() + "或" + ServiceStatusEnum.FINISH.getTitle(), status.getTitle()));
         }
         // TODO: 2023/8/8 业务校验 服务单元完成了相关准备工作：服务范围划定、供应商划定
         List<SysDingGroup> sysDingGroupList = sysDingGroupService.list(new QueryWrapper<SysDingGroup>().lambda().eq(SysDingGroup::getServiceId,serviceUnitId));
@@ -146,7 +146,7 @@ public class TBServiceServiceImpl extends ServiceImpl<TBServiceMapper, TBService
         }
         ServiceStatusEnum status = tbService.getStatus();
         if (!ServiceStatusEnum.PUBLISH.equals(status)) {
-            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被关闭，当前状态[%s]", ServiceStatusEnum.PUBLISH, status));
+            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被关闭，当前状态[%s]", ServiceStatusEnum.PUBLISH.getTitle(), status.getTitle()));
         }
         tbService.setStatus(ServiceStatusEnum.FINISH);
         this.updateById(tbService);
@@ -162,7 +162,7 @@ public class TBServiceServiceImpl extends ServiceImpl<TBServiceMapper, TBService
         }
         ServiceStatusEnum status = tbService.getStatus();
         if (!ServiceStatusEnum.FINISH.equals(status)) {
-            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被重启，当前状态[%s]", ServiceStatusEnum.FINISH, status));
+            throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被重启，当前状态[%s]", ServiceStatusEnum.FINISH.getTitle(), status.getTitle()));
         }
         tbService.setStatus(ServiceStatusEnum.PUBLISH);
         this.updateById(tbService);

sop-business/src/main/resources/mapper/TBCrmMapper.xml

@@ -26,6 +26,7 @@
             sys_level sl ON sc.level_id = sl.id
         <where>
             AND tbc.enable
+            AND tbc.service_id IS NOT null
             <if test="serviceUnitId != null">
                 AND tbc.service_id = #{serviceUnitId}
             </if>