Merge remote-tracking branch 'origin/master'

manailin

2022-04-08 ce840481a862a10d51e9d50923f8d63fa324bf83

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComFmsApi.java

@@ -153,9 +153,9 @@
    @ApiOperation("新增团队")
    @PostMapping("/team/add")
    public R addFmsTeam(@RequestBody @Valid AddTeamDTO addTeamDTO) {
        if (isNotBlank(addTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(addTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        // if (isNotBlank(addTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(addTeamDTO.getPhone())) {
        //     return R.fail("手机号格式错误");
        // }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        addTeamDTO.setCreatedBy(loginUserInfo.getUserId());
@@ -166,9 +166,9 @@
    @ApiOperation("修改团队信息")
    @PostMapping("/team/edit")
    public R editFmsTeam(@RequestBody @Valid EditTeamDTO editTeamDTO) {
        if (isNotBlank(editTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(editTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        // if (isNotBlank(editTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(editTeamDTO.getPhone())) {
        //     return R.fail("手机号格式错误");
        // }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        editTeamDTO.setUpdatedBy(loginUserInfo.getUserId());