Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-25 0eb83b49a381c31a51b8c8cec9e4d9d88fd5d16f

 zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java

@@ -148,6 +148,27 @@
    }

    /**
     * 新增门店管理员
     */
    @RemoveRequestToken
    @PostMapping(value = "/addShopAdmin")
    public @ResponseBody
    AjaxResult addShopAdmin(SysUsers sysUsers) {

        SysUsers loginUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        loginUser.setCreateBy(loginUser.getSuName());
        sysUsers.setCompanyId(loginUser.getCompanyId());
        sysUsers.setShopId(loginUser.getShopId());
        int i = sysUsersService.addAdmin(sysUsers);
        if (i > 0) {
            return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.ADD_SUCCES, AppVocabularyCode.ADMIN);
        } else {
            throw new GlobleException(SystemErrorCode.DATA_ADD_FAIL);
        }
    }


    /**
     * 修改公司管理员
     * 不含密码
     *
@@ -177,6 +198,8 @@
    }




    @RequestMapping(value = "/goStaffEditForm")
    public String goStaffEditForm() {
        SysUsers loginUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);