企业搜索排序
parent
a6131058b2
commit
14a6ffc7d0
|
|
@ -3,12 +3,6 @@ package com.zcloud.basic.info.command;
|
||||||
import cn.hutool.core.collection.CollUtil;
|
import cn.hutool.core.collection.CollUtil;
|
||||||
import com.alibaba.cola.dto.Response;
|
import com.alibaba.cola.dto.Response;
|
||||||
import com.alibaba.cola.exception.BizException;
|
import com.alibaba.cola.exception.BizException;
|
||||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
|
||||||
import com.jjb.saas.system.client.dept.facade.DeptFacade;
|
|
||||||
import com.jjb.saas.system.client.dept.request.FacadeAddDeptCmd;
|
|
||||||
import com.jjb.saas.system.client.user.facade.UserFacade;
|
|
||||||
import com.jjb.saas.system.client.user.request.FacadeUserAddCmd;
|
|
||||||
import com.jjb.saas.system.enums.org.DeptTypeEnum;
|
|
||||||
import com.zcloud.basic.info.command.convertor.DepartmentSuperviseCoConvertor;
|
import com.zcloud.basic.info.command.convertor.DepartmentSuperviseCoConvertor;
|
||||||
import com.zcloud.basic.info.domain.enums.CommonFlagEnum;
|
import com.zcloud.basic.info.domain.enums.CommonFlagEnum;
|
||||||
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
||||||
|
|
|
||||||
|
|
@ -40,11 +40,7 @@ public class DepartmentPageQry extends PageQuery {
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "部门级别编码", name = "eqLevel")
|
@ApiModelProperty(value = "部门级别编码", name = "eqLevel")
|
||||||
private String eqLevel;
|
private String eqLevel;
|
||||||
/**
|
|
||||||
* 单位类型编码
|
|
||||||
*/
|
|
||||||
@ApiModelProperty(value = "单位类型编码", name = "eqDeptType")
|
|
||||||
private String eqDeptType;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,11 +39,7 @@ public class DepartmentQry extends PageQuery {
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "部门级别编码", name = "eqLeve")
|
@ApiModelProperty(value = "部门级别编码", name = "eqLeve")
|
||||||
private String eqLevel;
|
private String eqLevel;
|
||||||
/**
|
|
||||||
* 单位类型编码
|
|
||||||
*/
|
|
||||||
@ApiModelProperty(value = "单位类型编码", name = "eqDeptType")
|
|
||||||
private String eqDeptType;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,7 @@ import com.jjb.saas.framework.auth.model.SSOUser;
|
||||||
import com.jjb.saas.framework.auth.utils.AuthContext;
|
import com.jjb.saas.framework.auth.utils.AuthContext;
|
||||||
import com.jjb.saas.system.client.dept.facade.DeptFacade;
|
import com.jjb.saas.system.client.dept.facade.DeptFacade;
|
||||||
import com.jjb.saas.system.client.dept.request.DeptAddCmd;
|
import com.jjb.saas.system.client.dept.request.DeptAddCmd;
|
||||||
import com.jjb.saas.system.client.dept.request.FacadeAddDeptCmd;
|
|
||||||
import com.jjb.saas.system.client.dept.response.DeptDetailCO;
|
import com.jjb.saas.system.client.dept.response.DeptDetailCO;
|
||||||
import com.jjb.saas.system.enums.org.DeptTypeEnum;
|
|
||||||
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
|
||||||
import com.zcloud.basic.info.domain.model.DepartmentE;
|
import com.zcloud.basic.info.domain.model.DepartmentE;
|
||||||
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
|
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,7 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
|
||||||
if(CollUtil.isNotEmpty(enterpriseType)){
|
if(CollUtil.isNotEmpty(enterpriseType)){
|
||||||
queryWrapper.in("type",enterpriseType );
|
queryWrapper.in("type",enterpriseType );
|
||||||
}
|
}
|
||||||
|
queryWrapper.orderByAsc("corp_order");
|
||||||
IPage<CorpInfoDO> result = corpInfoMapper.selectPage(iPage, queryWrapper);
|
IPage<CorpInfoDO> result = corpInfoMapper.selectPage(iPage, queryWrapper);
|
||||||
return PageHelper.pageToResponse(result, result.getRecords());
|
return PageHelper.pageToResponse(result, result.getRecords());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue