瀏覽代碼

feat 主流云存储均以支持

1 月之前
父節點
當前提交
410c9352ae

+ 16 - 4
edu-travel-common/edu-travel-common-datasource/src/main/java/edu/travel/datasource/ProjectInterceptor.java

@@ -60,10 +60,22 @@ public class ProjectInterceptor implements InnerInterceptor {
                 EqualsTo deleteFlag = new EqualsTo();
                 deleteFlag.setLeftExpression(new Column("delete_flag"));
                 deleteFlag.setRightExpression(new StringValue("0"));
-                AndExpression targetExpression = new AndExpression(projectEq, deleteFlag);
-                AndExpression andExpression = new AndExpression(where, targetExpression);
-                plainSelect.setWhere(andExpression);
-                targetSql = plainSelect.toString();
+                String plainSelectString = plainSelect.toString();
+                if (plainSelectString.contains("project") && plainSelectString.contains("delete_flag")) {
+
+                }else {
+                    if (where != null) {
+                        AndExpression targetExpression = new AndExpression(projectEq, deleteFlag);
+                        AndExpression andExpression = new AndExpression(where, targetExpression);
+                        plainSelect.setWhere(andExpression);
+                    }else {
+                        AndExpression targetExpression = new AndExpression(projectEq, deleteFlag);
+                        plainSelect.setWhere(targetExpression);
+                    }
+
+                    targetSql = plainSelect.toString();
+                }
+
             }
             // 修改完成的sql 再设置回去
             PluginUtils.MPBoundSql mpBoundSql = PluginUtils.mpBoundSql(boundSql);