fix(config): 修复配置文件加载和用户查询参数映射问题
parent
0c8e1cf6e4
commit
9673af71a3
|
|
@ -3,8 +3,8 @@ spring:
|
||||||
import:
|
import:
|
||||||
# - classpath:nacos.yml
|
# - classpath:nacos.yml
|
||||||
# - classpath:sdk.yml
|
# - classpath:sdk.yml
|
||||||
# - classpath:nacos-prod.yml
|
- classpath:nacos-prod.yml
|
||||||
# - classpath:sdk-prod.yml
|
- classpath:sdk-prod.yml
|
||||||
- classpath:nacos-prod2.yml
|
# - classpath:nacos-prod2.yml
|
||||||
- classpath:sdk-prod2.yml
|
# - classpath:sdk-prod2.yml
|
||||||
- classpath:swagger.yml
|
- classpath:swagger.yml
|
||||||
|
|
|
||||||
|
|
@ -176,8 +176,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
// List<Long> ids = new ArrayList<>();
|
// List<Long> ids = new ArrayList<>();
|
||||||
// ids.add(1999009782763397120L);
|
// ids.add(1999009782763397120L);
|
||||||
// Map<Long, String> sd1 = zcloudDepartmentFacade.listFullName(ids);
|
// Map<Long, String> sd1 = zcloudDepartmentFacade.listFullName(ids);
|
||||||
if (!ObjectUtils.isEmpty(params.get("eqEmploymentFlag"))) {
|
if (!ObjectUtils.isEmpty(params.get("employmentFlag"))) {
|
||||||
params.put("employmentFlag", params.get("eqEmploymentFlag"));
|
params.put("employmentFlag", params.get("employmentFlag"));
|
||||||
}
|
}
|
||||||
if (!ObjectUtils.isEmpty(params.get("isMyCorp"))) {
|
if (!ObjectUtils.isEmpty(params.get("isMyCorp"))) {
|
||||||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue