|
@@ -64,9 +64,10 @@ public class TbFamilyMemberController extends BaseController {
|
|
|
*/
|
|
|
@ApiOperation("获取家族成员详细信息")
|
|
|
@PreAuthorize("@ss.hasPermi('system:member:query')" )
|
|
|
- @GetMapping(value = "/{id}" )
|
|
|
+ @GetMapping(value = "/get/{id}" )
|
|
|
public AjaxResult getInfo(@PathVariable("id" ) String id) {
|
|
|
- return AjaxResult.success(userService.getMember("member",id,null));
|
|
|
+ AppMemberVo memberVo = userService.getMember("member",id,null);
|
|
|
+ return AjaxResult.success(memberVo);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -77,6 +78,12 @@ public class TbFamilyMemberController extends BaseController {
|
|
|
@Log(title = "家族成员" , businessType = BusinessType.INSERT)
|
|
|
@PostMapping
|
|
|
public AjaxResult add(@RequestBody AppMemberVo memberVo) {
|
|
|
+ if (StringUtils.isBlank(memberVo.getMobile())){
|
|
|
+ return AjaxResult.error("手机号不能为空");
|
|
|
+ }
|
|
|
+ if (memberVo.getUserId().equals(memberVo.getSpouseUserId())) {
|
|
|
+ return AjaxResult.error("配偶不能选自己");
|
|
|
+ }
|
|
|
return toAjax(iTbFamilyMemberService.saveOrUpdate(memberVo) ? 1 : 0);
|
|
|
}
|
|
|
|
|
@@ -88,6 +95,9 @@ public class TbFamilyMemberController extends BaseController {
|
|
|
@Log(title = "家族成员" , businessType = BusinessType.UPDATE)
|
|
|
@PutMapping
|
|
|
public AjaxResult edit(@RequestBody AppMemberVo memberVo) {
|
|
|
+ if (memberVo.getUserId().equals(memberVo.getSpouseUserId())) {
|
|
|
+ return AjaxResult.error("配偶不能选自己");
|
|
|
+ }
|
|
|
return toAjax(iTbFamilyMemberService.saveOrUpdate(memberVo) ? 1 : 0);
|
|
|
}
|
|
|
|