diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index e8d835861..d4b966de0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -149,7 +149,10 @@ public class MallUserInfoController extends BaseController { PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); } - userInfo.setIsAdmin(null); + if (!currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { + // 只有超级管理员才能设置超级管理员 + userInfo.setIsAdmin(null); + } if (currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()) && currentUser.getId().equals(userInfo.getId())) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 492b145ea..609e05cb7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -86,10 +86,15 @@ public class WxInfoController extends BaseController { Map retMap = getOpenIdInfo(appId, code); String openId = retMap.get("openId"); MallUserInfo user = mallUserInfoService.getByOpenId(openId); + if(user == null) { + return new ResultData(ErrorCode.USER_NO_PERMISSION, retMap); + } if(!user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN, retMap); } + retMap.put("phone", user.getPhone()); + retMap.put("msg", "领导来了,欢迎"); return new ResultData(retMap); } catch (Exception e) { @@ -192,9 +197,16 @@ public class WxInfoController extends BaseController { resultMap.put("phone", phone); MallUserInfo user = mallUserInfoService.getByPhone(phone); + if(user == null) { + return new ResultData(ErrorCode.USER_NO_PERMISSION, resultMap); + } if (user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { resultMap.put("phone", user.getPhone()); resultMap.put("admin", "1"); + + user.setOpenId(openId); + mallUserInfoService.saveOrUpdate(user); + return new ResultData(resultMap); } else { return new ResultData(ErrorCode.USER_NOT_ADMIN, resultMap);