no message

src/main/java/com/chenyang/nse/bussiness/controller/core/TdataSourceController.java

@@ -18,8 +18,12 @@ import com.chenyang.nse.bussiness.tools.string.AesTool;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.mapping.Join;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -194,9 +198,14 @@ public class TdataSourceController {
       String projectId = map.get("projectId").toString();
       String uid = loginUser.getTsysUser().getId();
       String gid = loginUser.getTsysGroup() == null ? "" : loginUser.getTsysGroup().getId();
+      List<String> param = new ArrayList<>();
+      param.add(uid);
+      if (StringUtils.isNotEmpty(gid)){
+         param.add(gid);
+      }
       String userid = "";
       if (!"1".equals(uid)) {
-         userid = "('" + uid + "','" + gid + "')";
+         userid = param.stream().collect(Collectors.joining("','","('","')"));
       }
 
       List<DatasystemProjectdatasourceVO> list = this.tdataProjectService.queryByEditSort(dbtype, flag, userid);
@@ -210,17 +219,21 @@ public class TdataSourceController {
          list.add(datasystemProjectdatasourceVO);
       }
 
-      int p = list.size();
+//      int p = list.size();
 
-      for(int i = 0; i < p; ++i) {
-         Map map1 = (Map)list.get(i);
-         String id = (String)map1.get("tid");
-         if (null != id && !"".equals(id) && this.dataSystemService.checkUsedByProject(id, projectId)) {
-            list.remove(i);
-            --p;
-            --i;
-         }
+      if (!StringUtils.isEmpty(projectId)) {
+         list = list.stream().filter(item-> this.dataSystemService.checkUsedByProject(item.getTid(), projectId)).collect(Collectors.toList());
+         return RespHelper.<List<DatasystemProjectdatasourceVO>>successResp(list, list.size());
       }
+//      for(int i = 0; i < p; ++i) {
+//         Map map1 = (Map)list.get(i);
+//         String id = (String)map1.get("tid");
+//         if (null != id && !"".equals(id) && this.dataSystemService.checkUsedByProject(id, projectId)) {
+//            list.remove(i);
+//            --p;
+//            --i;
+//         }
+//      }
 
       return RespHelper.<List<DatasystemProjectdatasourceVO>>successResp(list, list.size());
    }

src/main/java/com/chenyang/nse/bussiness/service/core/impl/DataSystemServiceImpl.java

@@ -2357,13 +2357,18 @@ public class DataSystemServiceImpl implements DataSystemService {
 
    public boolean checkUsedByProject(String datasystemid) {
       List<TCoreProjectDatasource> datasourcesInfo = this.tCoreProjectDatasourceDao.queryAll(new Criterion[]{Restrictions.eq("systemsource_id", datasystemid)});
-      return datasourcesInfo.size() != 0;
+      return !datasourcesInfo.isEmpty();
    }
 
-   public boolean checkUsedByProject(String datasystemid, String projectId) {
-      List<TCoreProjectDatasource> datasourcesInfo = this.tCoreProjectDatasourceDao.queryAll(new Criterion[]{Restrictions.eq("systemsource_id", datasystemid), Restrictions.ne("project_id", projectId)});
-      return datasourcesInfo.size() != 0;
+public boolean checkUsedByProject(String datasystemid, String projectId) {
+   List<Criterion> criteria = new ArrayList<>();
+   criteria.add(Restrictions.eq("systemsource_id", datasystemid));
+   if (projectId != null && !projectId.isEmpty()) {
+      criteria.add(Restrictions.ne("project_id", projectId));
    }
+   List<TCoreProjectDatasource> datasourcesInfo = this.tCoreProjectDatasourceDao.queryAll(criteria.toArray(new Criterion[0]));
+   return !datasourcesInfo.isEmpty();
+}
 
    public int checkRepeatName(String sysname, String datasystemid) {
       new ArrayList();