diff --git a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java
index f240dd14..ef135851 100644
--- a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java
@@ -199,12 +199,12 @@ public class PqSourceServiceImpl extends ServiceImpl<PqSourceMapper, PqSource> i
      * @return 检测源名称
      */
     private String generatePqSourceName(PqSourceParam param, boolean isAdd) {
-        DevType devType = devTypeService.getById(param.getDevType());
+        DictData devType = dictDataService.getDictDataById(param.getDevType());
         DictData typeDictData = dictDataService.getDictDataById(param.getType());
 
         if (ObjectUtil.isNotNull(devType) && ObjectUtil.isNotNull(typeDictData)) {
             if (isAdd) {
-                int count = this.lambdaQuery().eq(PqSource::getPattern, param.getPattern()).count();
+                int count = this.lambdaQuery().eq(PqSource::getPattern, param.getPattern()).eq(PqSource::getState, DataStateEnum.ENABLE.getCode()).count();
                 return typeDictData.getName() + "-" + devType.getName() + "-" + (count + 1);
             } else {
                 PqSource pqSource = this.lambdaQuery().eq(PqSource::getId, ((PqSourceParam.UpdateParam) param).getId()).one();