Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

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

@@ -124,7 +124,7 @@ public class TBServiceServiceImpl extends ServiceImpl<TBServiceMapper, TBService
             throw ExceptionResultEnum.ERROR.exception("未找到服务单元");
         }
         ServiceStatusEnum status = tbService.getStatus();
-        if (!ServiceStatusEnum.NEW.equals(status) && ServiceStatusEnum.FINISH.equals(status)) {
+        if (!ServiceStatusEnum.NEW.equals(status) && !ServiceStatusEnum.FINISH.equals(status)) {
             throw ExceptionResultEnum.ERROR.exception(String.format("只有[%s]状态的服务单元可以被发布，当前状态[%s]", ServiceStatusEnum.NEW.getTitle() + "或" + ServiceStatusEnum.FINISH.getTitle(), status.getTitle()));
         }
         // TODO: 2023/8/8 业务校验 服务单元完成了相关准备工作：服务范围划定、供应商划定

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

@@ -26,7 +26,7 @@
                 LEFT JOIN
             sys_user creator ON tbs.create_id = creator.id
         <where>
-            AND tbs.enable
+            AND tbs.enable AND tbs.status != 'CANCEL'
             <if test="type != null">
                 AND tbs.type = #{type}
             </if>