Commit bd525abe by 陶光胜

门店控件修复

parent dce992f2
......@@ -70,8 +70,6 @@ public class StoreSearchUtils {
private WmStoreApiService wmStoreApiService;
public Integer isWgs(Integer userId, Integer enterpriseId, String searchJson){
ServiceResponse<DataAuthDTO> response = this.dataAuthApiService.ggetDataAuthByUserId(enterpriseId, userId);
DataAuthDTO dataAuthDTO = response.getResult() == null ? new DataAuthDTO() : response.getResult();
if(StringUtils.isBlank(searchJson)){
return 0;
}
......@@ -79,7 +77,7 @@ public class StoreSearchUtils {
StoreSearchQo storeSearchQo = json.getObject(StoreChannelEnum.OFFLINE.getChannel().toString(), StoreSearchQo.class);
log.info("searchJSON:{},storeSearchQo:{}", searchJson, JSON.toJSONString(storeSearchQo));
if(storeSearchQo != null){
return storeSearchQo.getHasWgs() & dataAuthDTO.getNoOwnerStore();
return storeSearchQo.getHasWgs();
}
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment