Merge branch 'bugfix/pagebeannew_20230113' into 'master'

feat:[none] PageBeanNew bug

See merge request rays/pcloud-common-parent!326

pcloud-common-core/src/main/java/com/pcloud/common/core/mybatis/interceptor/ExecutorInterceptor.java

@@ -3,9 +3,11 @@ package com.pcloud.common.core.mybatis.interceptor;
 import java.util.Properties;
 
 import com.pcloud.common.core.mybatis.dialect.MySqlDialect;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.plugin.Intercepts;
 import org.apache.ibatis.plugin.Invocation;
 import org.apache.ibatis.plugin.Plugin;
@@ -63,6 +65,13 @@ public class ExecutorInterceptor extends AbstractInterceptor implements Initiali
 
 			queryArgs[ROWBOUNDS_INDEX] = new RowBounds(offset, limit);
 			BoundSql newBoundSql = new BoundSql(ms.getConfiguration(), sql, boundSql.getParameterMappings(), boundSql.getParameterObject());
+			if (CollectionUtils.isNotEmpty(boundSql.getParameterMappings())) {
+				for (ParameterMapping p : boundSql.getParameterMappings()) {
+					if (boundSql.hasAdditionalParameter(p.getProperty())) {
+						newBoundSql.setAdditionalParameter(p.getProperty(), boundSql.getAdditionalParameter(p.getProperty()));
+					}
+				}
+			}
 			MappedStatement newMs = copyFromMappedStatement(ms, new BoundSqlSqlSource(newBoundSql), false);
 			queryArgs[MAPPED_STATEMENT_INDEX] = newMs;
 
@@ -89,6 +98,13 @@ public class ExecutorInterceptor extends AbstractInterceptor implements Initiali
 			}
 
 			BoundSql newBoundSql = new BoundSql(ms.getConfiguration(), sql, boundSql.getParameterMappings(), boundSql.getParameterObject());
+			if (CollectionUtils.isNotEmpty(boundSql.getParameterMappings())) {
+				for (ParameterMapping p : boundSql.getParameterMappings()) {
+					if (boundSql.hasAdditionalParameter(p.getProperty())) {
+						newBoundSql.setAdditionalParameter(p.getProperty(), boundSql.getAdditionalParameter(p.getProperty()));
+					}
+				}
+			}
 			MappedStatement newMs = copyFromMappedStatement(ms, new BoundSqlSqlSource(newBoundSql), true);
 			queryArgs[MAPPED_STATEMENT_INDEX] = newMs;
 			queryArgs[PARAMETER_INDEX] = parameter;