#E10-42# 分析接口报错修复

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitDocumentAnalysisCmd.java

@@ -530,8 +530,10 @@ public class CockpitDocumentAnalysisCmd {
                         "    from document t \n" +
                         "    inner join folder l on l.id = t.folder \n" +
                         "    where t.creator = ?  \n" +
-                        "    and delete_type = 0 \n" +
+                        "    and t.delete_type = 0 \n" +
-                        "    and tenant_key= ? " +
+                        "    and t.tenant_key= ? " +
+                        "    and l.delete_type = 0 \n" +
+                        "    and l.tenant_key= ? " +
                         "    group by t.folder,l.name \n" +
                         "  ) w  order by w.cou desc  \n" +
                         ") p limit 5 " ;
@@ -548,6 +550,11 @@ public class CockpitDocumentAnalysisCmd {
             sqlParamEntity.setValue(tenantKey);
             sqlparam.add(sqlParamEntity);
 
+            sqlParamEntity = new SqlParamEntity();
+            sqlParamEntity.setParamType(SqlParamType.VARCHAR);
+            sqlParamEntity.setValue(tenantKey);
+            sqlparam.add(sqlParamEntity);
+
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
             recordList = databaseUtils.getDataSourceList(result);
 

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkDate3TypeCmd.java

@@ -6,12 +6,10 @@ import com.weaver.framework.rpc.annotation.RpcReference;
 import com.weaver.project.entity.SimpleMainline;
 import com.weaver.project.service.RemoteMainlineService;
 import com.weaver.seconddev.cockpit.util.DatabaseUtils;
-import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils;
 import com.weaver.teams.core.orm.mybatis.Page;
 import com.weaver.teams.domain.crm.RemoteCustomerService;
 import com.weaver.teams.domain.crm.SimpleCustomer;
 import com.weaver.teams.domain.user.SimpleEmployee;
-import com.weaver.workrelate.performance.api.rest.RemotePerformanceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java

@@ -315,8 +315,10 @@ public class CockpitWorkflowAnalysisCmd {
                         "           from wfc_requestbase t\n" +
                         "           inner join wfp_base p on p.id = t.workflowid\n" +
                         "           where t.userid = ? \n" +
-                        "           and delete_type = 0 \n" +
+                        "           and t.delete_type=0\n" +
-                        "           and tenant_key= ? " +
+                        "           and p.delete_type=0\n" +
+                        "           and t.tenant_key= ? \n" +
+                        "           and p.tenant_key = ?" +
                         "           group by t.workflowid,p.workflowname\n" +
                         "       ) p order by p.cou desc \n" +
                         " ) w limit 5" ;
@@ -333,6 +335,11 @@ public class CockpitWorkflowAnalysisCmd {
             sqlParamEntity.setValue(tenantKey);
             sqlparam.add(sqlParamEntity);
 
+            sqlParamEntity = new SqlParamEntity();
+            sqlParamEntity.setParamType(SqlParamType.VARCHAR);
+            sqlParamEntity.setValue(tenantKey);
+            sqlparam.add(sqlParamEntity);
+
             Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
             recordList = databaseUtils.getDataSourceList(result);