Merge remote-tracking branch 'origin/develop_dl_bugfix' into develop_dl_bugfix

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/interceptor/PluginInterceptor.java

@@ -24,12 +24,13 @@ import java.util.Properties;
 @Intercepts({
         @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}),
         @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class, CacheKey.class, BoundSql.class}),
-            }
+}
 )
 public class PluginInterceptor implements Interceptor {
 
     /**
      * 进行拦截的时候要执行的方法
+     *
      * @param invocation
      * @return
      * @throws Throwable
@@ -56,25 +57,25 @@ public class PluginInterceptor implements Interceptor {
             cacheKey = (CacheKey) args[4];
             boundSql = (BoundSql) args[5];
         }
-            //id为执行的mapper方法的全路径名，如com.metro.dao.UserMapper.insertUser
+        //id为执行的mapper方法的全路径名，如com.metro.dao.UserMapper.insertUser
         String id = mappedStatement.getId();
 
         //获取到原始sql语句
         String sql = boundSql.getSql();
 
-        if("com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper.selectPersonListCount".equals(id) ||
-           "com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper.selectPersonList".equals(id)) {
+        if ("com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper.selectPersonListCount".equals(id) ||
+                "com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper.selectPersonList".equals(id)) {
             HashMap par = new HashMap();
-            if(parameter instanceof HashMap) {
-                par = (HashMap)((HashMap<?, ?>) parameter).get("map");
+            if (parameter instanceof HashMap) {
+                par = (HashMap) ((HashMap<?, ?>) parameter).get("map");
             }
 
-            LinkedHashMap<String,String> fieldsValue = (LinkedHashMap<String, String>) par.get("fieldsValue");
+            LinkedHashMap<String, String> fieldsValue = (LinkedHashMap<String, String>) par.get("fieldsValue");
             Iterator<String> iterator = fieldsValue.keySet().stream().iterator();
 
             while (iterator.hasNext()) {
                 String next = iterator.next();
-                sql =  sql.replaceFirst("item",next).replaceFirst("ietmValue", new StringBuffer().append("'").append(fieldsValue.get(next)).append("'").toString());
+                sql = sql.replaceFirst("item", next).replaceFirst("ietmValue", new StringBuffer().append("'").append(fieldsValue.get(next)).append("'").toString());
             }
 
             //通过反射修改sql语句
@@ -82,7 +83,7 @@ public class PluginInterceptor implements Interceptor {
             field.setAccessible(true);
             field.set(boundSql, sql);
             return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
-        }  else {
+        } else {
             return invocation.proceed();
         }
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/interceptor/PluginInterceptor.java

@@ -22,12 +22,13 @@ import java.util.Properties;
 @Intercepts({
         @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}),
         @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class, CacheKey.class, BoundSql.class}),
-            }
+}
 )
 public class PluginInterceptor implements Interceptor {
 
     /**
      * 进行拦截的时候要执行的方法
+     *
      * @param invocation
      * @return
      * @throws Throwable
@@ -54,17 +55,17 @@ public class PluginInterceptor implements Interceptor {
             cacheKey = (CacheKey) args[4];
             boundSql = (BoundSql) args[5];
         }
-            //id为执行的mapper方法的全路径名，如com.metro.dao.UserMapper.insertUser
+        //id为执行的mapper方法的全路径名，如com.metro.dao.UserMapper.insertUser
         String id = mappedStatement.getId();
 
         //获取到原始sql语句
         String sql = boundSql.getSql();
 
-       if("com.yeejoin.equipmanage.mapper.FormInstanceMapper.queryForMapList".equals(id)) {
+        if ("com.yeejoin.equipmanage.mapper.FormInstanceMapper.queryForMapList".equals(id)) {
             //执行结果
-            HashMap<String,String> par = new LinkedHashMap<>();
-            if(parameter instanceof HashMap) {
-                par = (HashMap<String, String>)((HashMap<?, ?>) parameter).get("params");
+            HashMap<String, String> par = new LinkedHashMap<>();
+            if (parameter instanceof HashMap) {
+                par = (HashMap<String, String>) ((HashMap<?, ?>) parameter).get("params");
             }
 
 
@@ -72,7 +73,7 @@ public class PluginInterceptor implements Interceptor {
 
             while (iterator.hasNext()) {
                 String next = iterator.next();
-                sql =  sql.replace("item",next);
+                sql = sql.replace("item", next);
             }
 
             //通过反射修改sql语句