| @@ -190,7 +190,6 @@ public class MallUserInfoController extends BaseController { | |||||
| currentUser.getId().equals(userInfo.getId())) { | currentUser.getId().equals(userInfo.getId())) { | ||||
| // 超管 | // 超管 | ||||
| MallUserInfo adminUser = new MallUserInfo(); | MallUserInfo adminUser = new MallUserInfo(); | ||||
| adminUser.setFlowPermission(userInfo.getFlowPermission()); | |||||
| adminUser.setEmail(userInfo.getEmail()); | adminUser.setEmail(userInfo.getEmail()); | ||||
| adminUser.setId(userInfo.getId()); | adminUser.setId(userInfo.getId()); | ||||
| if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { | ||||
| @@ -386,22 +385,5 @@ public class MallUserInfoController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| @ApiOperation(value = "审批权限用户列表", response = String.class) | |||||
| @GetMapping("getFlowPermissionList") | |||||
| //@RequiresPermissions("sys:user:flowlist") | |||||
| @SystemControllerLog(description = "用户管理-审批权限用户列表") | |||||
| public ResultData getFlowPermissionList() { | |||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::getFlowPermissionList"); | |||||
| MallUserInfo mallUserInfo = new MallUserInfo(); | |||||
| mallUserInfo.setFlowPermission(EnumFlowPermissionType.CONTRACT.getCode()+""); | |||||
| List<MallUserInfo> contractUserList = userInfoService.findList(mallUserInfo); | |||||
| mallUserInfo.setFlowPermission(EnumFlowPermissionType.BILL.getCode()+""); | |||||
| List<MallUserInfo> billUserList = userInfoService.findList(mallUserInfo); | |||||
| Map<String,Object> resultMap = new HashedMap(); | |||||
| resultMap.put("contractUserList",contractUserList); | |||||
| resultMap.put("billUserList",billUserList); | |||||
| return new ResultData(resultMap); | |||||
| } | |||||
| } | } | ||||