iidi
/
bocloud.ams
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "优化" 

This reverts commit de55ab217f.
develop
yuemian 2024-10-31 15:57:36 +08:00
parent de55ab217f
commit 6f32727498
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bocloud.ams.repository/src/main/java/com/bocloud/ams/repository/instance/InstanceRepository.java
View File

@ -208,7 +208,7 @@ public class InstanceRepository extends BasicGenericDao<Instance, Long> {
// 行转列的表头 // 行转列的表头
String sql; String sql;
if (StringUtils.isNotEmpty(positionKey)) { if (StringUtils.isNotEmpty(positionKey)) {
sql = "SELECT GROUP_CONCAT('MAX(IF(P.ID = ',P.id,',INSV.PROPERTY_VALUE,NULL)) AS ''',P.code,'''') as sqlResult" + " from " +positionKey+".ci_property AS P where P.is_deleted = 0 and P.module_id=" + moduleId; sql = "SELECT GROUP_CONCAT('MAX(IF(P.ID = ',P.id,',INSV.PROPERTY_VALUE,NULL)) AS ''',P.code,'''') as sqlResult" + " from " +positionKey+"ci_property AS P where P.is_deleted = 0 and P.module_id=" + moduleId;
} else { } else {
sql = "SELECT GROUP_CONCAT('MAX(IF(P.ID = ',P.id,',INSV.PROPERTY_VALUE,NULL)) AS ''',P.code,'''') as sqlResult" + " from ci_property AS P where P.is_deleted = 0 and P.module_id=" + moduleId; sql = "SELECT GROUP_CONCAT('MAX(IF(P.ID = ',P.id,',INSV.PROPERTY_VALUE,NULL)) AS ''',P.code,'''') as sqlResult" + " from ci_property AS P where P.is_deleted = 0 and P.module_id=" + moduleId;
} }
@ -228,13 +228,13 @@ public class InstanceRepository extends BasicGenericDao<Instance, Long> {
sqlBuilder.append(" FROM " + instanceTable + " INS"); sqlBuilder.append(" FROM " + instanceTable + " INS");
sqlBuilder.append(" LEFT JOIN " + instanceValueTable + " AS INSV ON INS.ID = INSV.instance_id and INSV.is_deleted=0 "); sqlBuilder.append(" LEFT JOIN " + instanceValueTable + " AS INSV ON INS.ID = INSV.instance_id and INSV.is_deleted=0 ");
if (StringUtils.isNotEmpty(positionKey)) { if (StringUtils.isNotEmpty(positionKey)) {
sqlBuilder.append(" LEFT JOIN" +positionKey+".ci_property AS P ON INS.module_id = P.module_id and INSV.property_id=P.id "); sqlBuilder.append(" LEFT JOIN" +positionKey+" ci_property AS P ON INS.module_id = P.module_id and INSV.property_id=P.id ");
} else { } else {
sqlBuilder.append(" LEFT JOIN ci_property AS P ON INS.module_id = P.module_id and INSV.property_id=P.id "); sqlBuilder.append(" LEFT JOIN ci_property AS P ON INS.module_id = P.module_id and INSV.property_id=P.id ");
} }
if (!hasAdminRole) { if (!hasAdminRole) {
if (StringUtils.isNotEmpty(positionKey)) { if (StringUtils.isNotEmpty(positionKey)) {
sqlBuilder.append(" LEFT JOIN" +positionKey+".ci_instance_authority AU on INS.module_id = AU.module_id and INS.id = AU.instance_id"); sqlBuilder.append(" LEFT JOIN" +positionKey+" ci_instance_authority AU on INS.module_id = AU.module_id and INS.id = AU.instance_id");
} else { } else {
sqlBuilder.append(" LEFT JOIN ci_instance_authority AU on INS.module_id = AU.module_id and INS.id = AU.instance_id"); sqlBuilder.append(" LEFT JOIN ci_instance_authority AU on INS.module_id = AU.module_id and INS.id = AU.instance_id");
} }