#

luxiaotao1123

2024-02-20 88ef94ea106bd3e39c4895f07988be89e974a8b4

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java

@@ -1,5 +1,6 @@
package com.zy.asrs.wcs.common.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
@@ -97,15 +98,32 @@
            }
        }

        if (!Cools.isEmpty(where.getCondition()) && !Cools.isEmpty(cls)) {
        Field[] fields = null;
        if (!Cools.isEmpty(cls)) {
            fields = Cools.getAllFields(cls);
            for (Field field : fields) {
                if ("createTime".equals(field.getName())) {
                    queryWrapper.orderByDesc(Utils.toSymbolCase(field.getName(), '_'));
                }
            }
        }

        if (!Cools.isEmpty(where.getCondition()) && !Cools.isEmpty(fields)) {
            List<String> columns = new ArrayList<>();
            for (Field field :Cools.getAllFields(cls)){
            for (Field field : fields){
                if (Modifier.isFinal(field.getModifiers())
                        || Modifier.isStatic(field.getModifiers())
                        || Modifier.isTransient(field.getModifiers())){
                    continue;
                }

                if (field.isAnnotationPresent(TableField.class)){
                    TableField annotation = field.getAnnotation(TableField.class);
                    if (!annotation.exist()) {
                        continue;
                    }
                }

                String column =  Utils.toSymbolCase(field.getName(), '_');
                columns.add(column);
            }