fix: SQL拼接错误处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/interceptor/PluginInterceptor.java

@@ -9,12 +9,10 @@ import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ReflectionUtils;
 
 import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Properties;
+import java.util.*;
 
 @Component
 //	标志该类是一个拦截器
@@ -64,28 +62,23 @@ public class PluginInterceptor implements Interceptor {
             //执行结果
             HashMap<String,Object> par = new LinkedHashMap<>();
             if(parameter instanceof HashMap) {
-                par = (HashMap<String, Object>)((HashMap<?, ?>) parameter).get("paramMap");
+                par = (HashMap<String, Object>) parameter;
             }
 
-           LinkedHashMap<String,String> fieldsValue = (LinkedHashMap<String, String>) par.get("extraFields");
-           Iterator<String> iterator = fieldsValue.keySet().stream().iterator();
+           List<String> extraFields = (ArrayList< String>) par.get("extraFields");
 
-           LinkedHashMap<String,String> fieldsValue2 = (LinkedHashMap<String, String>) par.get("extraStrFilters");
-           Iterator<String> iterator1 = fieldsValue2.keySet().stream().iterator();
+           List<String> extraStrFilters = (ArrayList<String>) par.get("extraStrFilters");
 
-            while (iterator.hasNext()) {
-                String next = iterator.next();
-                sql =  sql.replaceFirst("_field",next);
-            }
-
-           while (iterator1.hasNext()) {
-               String next = iterator1.next();
-               sql =  sql.replaceFirst("_str",next);
+           for (String field : extraFields) {
+               sql =  sql.replaceFirst("_field", field);
+           }
+           for (String filter : extraStrFilters) {
+               sql =  sql.replaceFirst("_str", filter);
            }
 
             //通过反射修改sql语句
             Field field = boundSql.getClass().getDeclaredField("sql");
-            field.setAccessible(true);
+            ReflectionUtils.makeAccessible(field);
             field.set(boundSql, sql);
             return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
         } else {