Commit e14b6393 authored by 唐峰's avatar 唐峰

接口参数或请求头无租户参数,默认小咩租户

parent baf780fc
...@@ -125,6 +125,9 @@ public class InnerController implements IBaseController { ...@@ -125,6 +125,9 @@ public class InnerController implements IBaseController {
*/ */
@RequestMapping("/user/search/phoneNo") @RequestMapping("/user/search/phoneNo")
public JsonResult findByPhoneNo(String phoneNo, Integer tenantId) { public JsonResult findByPhoneNo(String phoneNo, Integer tenantId) {
if (tenantId == null) {
tenantId = getTenantId();
}
User user = userService.findByPhoneInDb(phoneNo,tenantId); User user = userService.findByPhoneInDb(phoneNo,tenantId);
if (user == null) { if (user == null) {
return JsonResult.buildErrorStateResult("查无此人", null, 4L); return JsonResult.buildErrorStateResult("查无此人", null, 4L);
...@@ -347,6 +350,9 @@ public class InnerController implements IBaseController { ...@@ -347,6 +350,9 @@ public class InnerController implements IBaseController {
*/ */
@RequestMapping("/user/search/userId") @RequestMapping("/user/search/userId")
public JsonResult findUserByUserId(Long userId, Integer tenantId) { public JsonResult findUserByUserId(Long userId, Integer tenantId) {
if (tenantId == null) {
tenantId = getTenantId();
}
User user = userService.findById(userId,tenantId); User user = userService.findById(userId,tenantId);
if (user != null) { if (user != null) {
return JsonResult.buildSuccessResult(null, new UserRet(user)); return JsonResult.buildSuccessResult(null, new UserRet(user));
...@@ -361,6 +367,9 @@ public class InnerController implements IBaseController { ...@@ -361,6 +367,9 @@ public class InnerController implements IBaseController {
@AccessForbiddenValidator @AccessForbiddenValidator
@RequestMapping("/user_detail/search/phone") @RequestMapping("/user_detail/search/phone")
public JsonResult findUserDetailByPhone(String phoneNo, Integer tenantId) { public JsonResult findUserDetailByPhone(String phoneNo, Integer tenantId) {
if (tenantId == null) {
tenantId = getTenantId();
}
UserInfoEntity userDetail = userInfoRepository.findByPhoneNoAndTenantId(phoneNo,tenantId); UserInfoEntity userDetail = userInfoRepository.findByPhoneNoAndTenantId(phoneNo,tenantId);
if (userDetail != null) { if (userDetail != null) {
return JsonResult.buildSuccessResult(null, UserInfoRet.getUserDetail(userDetail)); return JsonResult.buildSuccessResult(null, UserInfoRet.getUserDetail(userDetail));
......
...@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.Constants; ...@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.Constants;
import cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator; import cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator;
import cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator; import cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator;
import cn.quantgroup.xyqb.constant.UserConstant; import cn.quantgroup.xyqb.constant.UserConstant;
import cn.quantgroup.xyqb.controller.IBaseController;
import cn.quantgroup.xyqb.entity.User; import cn.quantgroup.xyqb.entity.User;
import cn.quantgroup.xyqb.entity.UserInfoEntity; import cn.quantgroup.xyqb.entity.UserInfoEntity;
import cn.quantgroup.xyqb.model.JsonResult; import cn.quantgroup.xyqb.model.JsonResult;
...@@ -27,7 +28,7 @@ import java.util.Map; ...@@ -27,7 +28,7 @@ import java.util.Map;
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/user/center") @RequestMapping("/user/center")
public class UserCenterController { public class UserCenterController implements IBaseController {
@Autowired @Autowired
private IUserInfoRepository userInfoRepository; private IUserInfoRepository userInfoRepository;
...@@ -55,6 +56,9 @@ public class UserCenterController { ...@@ -55,6 +56,9 @@ public class UserCenterController {
@PostMapping("/attach/list") @PostMapping("/attach/list")
public JsonResult queryUserAttachList(@RequestBody List<Long> userIds, @RequestParam(required = false) Integer tenantId) { public JsonResult queryUserAttachList(@RequestBody List<Long> userIds, @RequestParam(required = false) Integer tenantId) {
//默认羊小咩租户 //默认羊小咩租户
if (tenantId == null) {
tenantId = getTenantId();
}
if (CollectionUtils.isEmpty(userIds)) { if (CollectionUtils.isEmpty(userIds)) {
return JsonResult.buildErrorStateResult("用户 ID 不能为空", null); return JsonResult.buildErrorStateResult("用户 ID 不能为空", null);
} }
......
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