bug
parent
083bebf2ac
commit
6c2703edb4
|
|
@ -46,10 +46,8 @@ public class LocalDevUserContextConfig implements WebMvcConfigurer {
|
||||||
@Override
|
@Override
|
||||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
|
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
|
||||||
String orgInfoId = request.getHeader("orgInfoId");
|
String orgInfoId = request.getHeader("orgInfoId");
|
||||||
if (StringUtils.hasText(orgInfoId)) {
|
if (StringUtils.hasText(orgInfoId) && !"undefined".equals(orgInfoId)) {
|
||||||
ThreadLocalUserInfoAdapter.set(Long.valueOf(orgInfoId));
|
ThreadLocalUserInfoAdapter.set(Long.valueOf(orgInfoId));
|
||||||
} else if (defaultOrgId != null && defaultOrgId > 0) {
|
|
||||||
ThreadLocalUserInfoAdapter.set(defaultOrgId);
|
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -59,6 +57,6 @@ public class LocalDevUserContextConfig implements WebMvcConfigurer {
|
||||||
Object handler, Exception exception) {
|
Object handler, Exception exception) {
|
||||||
ThreadLocalUserInfoAdapter.clear();
|
ThreadLocalUserInfoAdapter.clear();
|
||||||
}
|
}
|
||||||
}).addPathPatterns(LOCAL_DEV_PATHS).excludePathPatterns("/**/getInfo/**");
|
}).addPathPatterns(LOCAL_DEV_PATHS).excludePathPatterns("/**/getInfo/**").excludePathPatterns("/**/org-info/**");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -79,8 +79,10 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
|
||||||
dataObject.setState(0);
|
dataObject.setState(0);
|
||||||
}
|
}
|
||||||
InsertFieldDefaults.apply(dataObject);
|
InsertFieldDefaults.apply(dataObject);
|
||||||
|
if (entity.getRegisterUserId() != null) {
|
||||||
dataObject.setCreateId(entity.getRegisterUserId());
|
dataObject.setCreateId(entity.getRegisterUserId());
|
||||||
dataObject.setUpdateId(entity.getRegisterUserId());
|
dataObject.setUpdateId(entity.getRegisterUserId());
|
||||||
|
}
|
||||||
orgInfoMapper.insert(dataObject);
|
orgInfoMapper.insert(dataObject);
|
||||||
entity.setId(dataObject.getId());
|
entity.setId(dataObject.getId());
|
||||||
return entity;
|
return entity;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue