修改sql拼接方法

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java

@@ -141,7 +141,7 @@ public class UserEmpowerInterceptor implements Interceptor {
 
             for (int i = 0; i < filed.length; i++) {
                 String sq=" ";
-                sq= filed[i]+getCondition(fileCondition[i],data);
+                sq= getCondition(filed[i],fileCondition[i],data);
                 sql.add(sq);
             }
         }else{
@@ -150,28 +150,49 @@ public class UserEmpowerInterceptor implements Interceptor {
         return sql;
     }
 
-    private String getCondition(String type, List<String> data){
+    private String getCondition(String filed,String type, List<String> data){
         String sql=" ";
         switch (type) {
             case "in":
-                sql = sql+" in "+getInData(data);
+                sql = sql+getInData( filed,data);
                 break;
             case "like":
-                sql = sql+" like "+getlikeData(data);
+                if(data.size()==1){
+                    sql = sql+getlikeData(filed,data);
+                }else{
+
+                }
+
+
                 break;
             case "likeLeft":
-                sql = sql+" like "+getlikeLeftData(data);
+                if(data.size()==1){
+                    sql = sql+getlikeLeftData(filed,data);
+                }else{
+
+                }
+
                 break;
             case "likeRight":
-                sql = sql+" like "+getlikeRightData(data);
+
+                if(data.size()==1){
+                    sql = sql+getlikeRightData(filed,data);
+                }else{
+
+                }
                 break;
             case "eq":
-                sql = sql+" = "+getData(data);
+
+                if(data.size()==1){
+                    sql = sql+getData(filed,data);
+                }else{
+
+                }
                 break;
         }
         return sql;
     }
-    private String getInData( List<String> data){
+    private String getInData( String filed,List<String> data){
         String sql=" ( ";
         for (int i = 0; i < data.size(); i++) {
             if(i==data.size()-1){
@@ -180,27 +201,85 @@ public class UserEmpowerInterceptor implements Interceptor {
                 sql=sql+"'"+ data.get(i)+"',";
             }
         }
-        return sql;
+        return filed+" in "+sql;
     }
-    private String getData( List<String> data){
+    private String getData(  String filed,List<String> data){
+        String sql="";
+        if(data.size()==1){
+
+            sql= sql+filed+" = "+data.get(0);
+        }else{
+            for (int i = 0; i < data.size(); i++) {
+                if(i==data.size()-1){
+                    sql= sql+filed+" = "+data.get(i)+" ";
+                }else{
+                    sql= sql+filed+" = "+data.get(i)+"  and  ";;
+                }
+            }
+
+        }
+
+        return sql;
+
 
-        return data.get(0);
     }
-    private String getlikeRightData( List<String> data){
+    private String getlikeRightData(  String filed,List<String> data){
+        String sql="";
+        if(data.size()==1){
+
+            sql= sql+filed+" = "+data.get(0)+ "%";
+        }else {
+            for (int i = 0; i < data.size(); i++) {
+                if (i == data.size() - 1) {
+                    sql = sql + filed + " = " + data.get(i) + "%" + " ";
+                } else {
+                    sql = sql + filed + " = " + data.get(i) + "%" + "  and  ";
+                }
+            }
+        }
 
-        return data.get(0)+"%";
+        return sql;
     }
-    private String getlikeLeftData( List<String> data){
+    private String getlikeLeftData( String filed, List<String> data){
+        String sql="";
+        if(data.size()==1){
 
-        return "%"+data.get(0);
+            sql= sql+filed+" = "+"%"+data.get(0);
+        }else {
+            for (int i = 0; i < data.size(); i++) {
+                if (i == data.size() - 1) {
+                    sql = sql + filed + " = " + "%"+data.get(i) +" ";
+                } else {
+                    sql = sql + filed + " = " + "%"+data.get(i) +"  and  ";
+                }
+            }
+        }
+
+        return sql;
     }
-    private String getlikeData( List<String> data){
+    private String getlikeData(  String filed,List<String> data){
+        String sql="";
+        if(data.size()==1){
 
-        return "%"+data.get(0)+"%";
+            sql= sql+filed+" = "+"%"+data.get(0)+"%";
+        }else {
+            for (int i = 0; i < data.size(); i++) {
+                if (i == data.size() - 1) {
+                    sql = sql + filed + " = " + "%"+data.get(i)+"%" +" ";
+                } else {
+                    sql = sql + filed + " = " + "%"+data.get(i)+"%" +"  and  ";
+                }
+            }
+        }
+
+        return sql;
     }
 
 
 
+
+
+
     /**
      * 获取当前添加数据权限DataAuth的执行语句对应mapper方法
      *