提交代码

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

@@ -9,6 +9,7 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.SubSelect;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
@@ -212,9 +213,16 @@ public class UserEmpowerInterceptor implements Interceptor {
                         sqldata = " 1= 2 ";
                     }
 
-                    if (ValidationUtil.isEmpty(selectBody.getWhere())) {
+                    if("com.yeejoin.amos.boot.module.hygf.api.mapper.HygfIcbcRecordMapper.pageList_COUNT".equals(mappedStatement.getId()))
+                    {
+                        PlainSelect selectSubBody= ((PlainSelect)((SubSelect)selectBody.getFromItem()).getSelectBody());
+                        AndExpression andExpr = new AndExpression(selectSubBody.getWhere(), CCJSqlParserUtil.parseCondExpression(sqldata));
+                        selectSubBody.setWhere(andExpr);
+                    }
+                    else if (ValidationUtil.isEmpty(selectBody.getWhere())) {
                         selectBody.setWhere(CCJSqlParserUtil.parseCondExpression(sqldata));
-                    } else {
+                    }
+                    else {
                         AndExpression andExpr = new AndExpression(selectBody.getWhere(), CCJSqlParserUtil.parseCondExpression(sqldata));
                         selectBody.setWhere(andExpr);
                     }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfIcbcRecordMapper.xml

@@ -93,7 +93,6 @@
 
 
     <select id="pageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO">
-        SELECT * FROM (
         SELECT
         MAX(icbc.sequence_nbr) AS sequenceNbr,
         MAX(ifnull ( icbc.cust_name, ph.owners_name )) AS custName,
@@ -106,7 +105,6 @@
         MAX(icbc.medium_id) AS mediumId,
         MAX(ph.rec_date) AS recDate,
         MAX(ph.regional_companies_name) AS regionalCompaniesName,
-        MAX(ph.regional_companies_code) AS regional_companies_code,
         MAX(ph.regional_companies_code) AS regionalCompaniesCode,
         MAX(wr.paymentAmount) AS paymentAmount,
         MAX(wr.payment_time) AS paymentTime
@@ -120,6 +118,7 @@
         LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
         LEFT JOIN ( SELECT amos_user_id, MAX ( payment_time ) payment_time, SUM ( payment_amount ) paymentAmount FROM hygf_icbc_withhold_record WHERE withhold_status = '成功' GROUP BY amos_user_id ) wr ON wr.amos_user_id = icbc.amos_user_id
         <where>
+            1=1
             <if test="param.custName != null and param.custName != ''">
                 AND (ph.owners_name LIKE CONCAT('%', #{param.custName}, '%'))
             </if>
@@ -154,7 +153,7 @@
             LIMIT ${param.offset}, ${param.limit}
         </if>
         GROUP BY ph.amos_user_id
-        ORDER BY MAX(ph.rec_date) DESC) ph
+        ORDER BY MAX(ph.rec_date) DESC
     </select>
 
     <select id="pageListSum" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO">