|
|
@@ -97,15 +97,23 @@ public class UserScrmController extends AppBaseController {
|
|
|
@Login
|
|
|
@ApiOperation("获取用户信息")
|
|
|
@GetMapping("/getUserInfo")
|
|
|
- public R getUserInfo(HttpServletRequest request){
|
|
|
+ public R getUserInfo(HttpServletRequest request, @RequestParam(value = "appId", required = false) String appId){
|
|
|
try {
|
|
|
FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
|
|
|
- if (user.getIsShow() !=null && user.getIsShow() == 0){
|
|
|
+
|
|
|
+ if (StringUtils.isNotEmpty(appId) && StringUtils.isNotEmpty(user.getAppId())) {
|
|
|
+ if (user.getAppId().contains(appId)) {
|
|
|
+ user.setIsShow(1);
|
|
|
+ } else {
|
|
|
+ user.setIsShow(0);
|
|
|
+ }
|
|
|
+ } else if (user.getIsShow() !=null && user.getIsShow() == 0){
|
|
|
FsStoreOrderScrm order = orderService.selectOrderByUserIdLimit1(user.getUserId());
|
|
|
if (order!=null){
|
|
|
user.setIsShow(1);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
return R.ok().put("user",user);
|
|
|
} catch (Exception e){
|
|
|
log.error("【获取用户信息】:{}",e);
|