Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -1546,7 +1546,7 @@ export default {
       let itemName = itemNames.reverse().join("!@");
       let dataSourceId = node.data.dataSourceId;
       this.queryParams.chooseItemStr = itemName;
-      this.isScreen = true;cd
+      this.isScreen = true;
       getNextAllItem(dataSourceId, itemName)
         .then((res) => {
           if (!res.data) {

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/service/impl/DataSourceServiceImpl.java

@@ -220,8 +220,11 @@ public class DataSourceServiceImpl implements DataSourceService {
         DataSource dataSource = dataSourceDao.getDataSourceById(id);
         String clsId = dataSource.getClsId();
         DataSourceDriver dataSourceDriver = dataSourceDao.getDataSourceDriverByclsId(clsId);
-        Integer dataSourceDriverId = dataSourceDriver.getId();
-        return Result.ok(dataSourceDao.getDbItemByDid(dataSourceDriverId));
+        if (Blank.isNotEmpty(dataSourceDriver)){
+            Integer dataSourceDriverId = dataSourceDriver.getId();
+            return Result.ok(dataSourceDao.getDbItemByDid(dataSourceDriverId));
+        }
+        return Result.ok(null);
     }
 
     @Override