Merge remote-tracking branch 'origin/master'

This commit is contained in:
majintao
2024-12-16 15:35:48 +08:00
@@ -86,14 +86,18 @@ public class DistrictController {
// }
if("b".equals(login_user_type) || "gb".equals(login_user_type)){
CacheUtils.putValue(CachePolicyEnum.LONG, UsersInfoService.class, weiXinId + "_city_"+ login_user_type , model.getCityName());
}
Long userId = Long.parseLong(CookieUtils.getCookieValue(request,"login_user_id"));
if(userId != null){
FjtUsers users = fjtUsersService.findById(userId);
if(users != null){
model.setRole(users.getRole());
}
}
try {
Long userId = Long.parseLong(CookieUtils.getCookieValue(request, "login_user_id"));
if (userId != null) {
FjtUsers users = fjtUsersService.findById(userId);
if (users != null) {
model.setRole(users.getRole());
}
}
} catch (Exception ex) {
}
model.setType(login_user_type);
return model;
}