|
|
@@ -24,6 +24,7 @@ import com.zd.model.constant.HttpStatus;
|
|
|
import com.zd.model.constant.SecurityConstants;
|
|
|
import com.zd.model.domain.R;
|
|
|
import com.zd.model.domain.ResultData;
|
|
|
+import com.zd.model.entity.LoginUser;
|
|
|
import com.zd.model.entity.SysUser;
|
|
|
import com.zd.model.enums.HardwareTypeEnum;
|
|
|
import com.zd.model.enums.SignEnum;
|
|
|
@@ -324,12 +325,19 @@ public class OneMachineController extends BaseController {
|
|
|
|
|
|
// 查询用户信息
|
|
|
R<SysUser> userResult = userService.getUserInfoByCardNum(username, SecurityConstants.INNER);
|
|
|
+
|
|
|
if (HttpStatus.ERROR == userResult.getCode()) {
|
|
|
throw new ServiceException(userResult.getMsg());
|
|
|
}
|
|
|
if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
|
|
|
throw new ServiceException("用户卡号:" + username + " 不存在");
|
|
|
}
|
|
|
+ //查询用户使用资格
|
|
|
+ SysUser user = userResult.getData();
|
|
|
+ //通过配置动态加载域名
|
|
|
+ String url = fileConfigUtils.getFileDomainApp() + user.getAvatar();
|
|
|
+ String imgUrl = UrlFormatUtils.getHttpsORHttpUrl(url);
|
|
|
+ user.setAvatar(imgUrl);
|
|
|
return userResult;
|
|
|
}
|
|
|
|