From 0634f6fa6e2e56fe5ebd0b960fe66cf467ac8769 Mon Sep 17 00:00:00 2001 From: LegnaYet <1023868505@qq.com> Date: Sun, 26 Apr 2020 16:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kiisoo/ic/store/service/PoiStoreStaffService.java | 5 ++++- .../com/kiisoo/ic/store/service/StoreEmployeeService.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java index 798c3cb..e818996 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java @@ -236,8 +236,11 @@ public class PoiStoreStaffService { BeanUtils.copyProperties(poiStoreStaffVO,privilageUserDO); Long userId = privilageUserService.addUser(privilageUserDO); if (null == userId ) return 0; + QueryWrapper rowMapper = new QueryWrapper<>(); + rowMapper.eq("code",poiStoreStaffVO.getRole()); + PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectOne(rowMapper); //添加用户和角色的关系 - privilageUserRoleService.insertUserRoleRelation(userId,poiStoreStaffVO.getRoleId()); + privilageUserRoleService.insertUserRoleRelation(userId,privilageRoleDO.getId()); if (StringUtils.isNotBlank(poiStoreStaffVO.getIsOpen())){ //添加一个账号 privilageAccountService.insertAccount(poiStoreStaffVO.getStaffCode(), AccountEnum.ACCOUNT_FIRST_PWD.getDescribe(), userId); diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index 9be388b..b370353 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -190,7 +190,7 @@ public class StoreEmployeeService { JSONObject qrCodeJson = JSONObject.parseObject(message); BsdShareCodeResponse bsdResponse = qrCodeJson.toJavaObject(BsdShareCodeResponse.class); if (bsdResponse.getSuccess()){ - return bsdResponse.getResultCode(); + return bsdResponse.getData(); } return null; }