Merge branch 'master-stander' into master-jiayan

cmg

2024-06-22 cb38789006b411b29fba27a6a60493dc78946e17

 src/main/java/com/hx/mybatis/aes/springbean/InitMysqlData.java

@@ -10,7 +10,6 @@
import com.hx.util.StringUtils;
import com.hx.util.mysql.aes.MysqlHexAesTool;

import javax.annotation.PostConstruct;
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.ExecutorService;
@@ -21,7 +20,7 @@
    /**
     * 项目启动就执行后就执行该方法
     */
    @PostConstruct
    //@PostConstruct 2022-06-17屏掉，暂时用不上
    public static void initData(String packPath, CommonService commonService){

        //项目启动的时候填入
@@ -76,6 +75,8 @@
        for(String fieldName:fieldData.getEncrypFields()){
            selectField.append(","+fieldName);
        }
        pageNum = pageNum*pageSize;

        sqlSentence.sqlSentence("SELECT "+selectField.toString()+" FROM "+fieldData.getTableName()+" LIMIT "+pageNum+","+pageSize,values);
        List<Map<String,Object>> list = commonService.selectListMap(CommonMapper.class,sqlSentence);