Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java

@@ -2,14 +2,12 @@

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TmsFactoryParamMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TmsFactoryParamService;
@@ -176,13 +174,7 @@
        if (pageWrap.getModel().getParam4() != null) {
             queryWrapper.eq(TmsFactoryParam::getParam4, pageWrap.getModel().getParam4());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.orderByAsc( TmsFactoryParam::getSortnum);
        return PageData.from(tmsFactoryParamMapper.selectPage(page, queryWrapper));
    }