From 334a07d99ac37ba92fb494edb08f31f6db16bafd Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 14 Jun 2019 15:04:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8E=9F=E6=9D=A5=E6=9D=83=E9=99=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MallUserInfoController.java | 18 ------------------ .../com/iformall/domain/po/MallUserInfo.java | 3 --- .../service/impl/MallUserInfoServiceImpl.java | 3 --- .../resources/mapper/MallUserInfoMapper.xml | 5 ----- 4 files changed, 29 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index e4ccda9e2..6cf41b2db 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -193,7 +193,6 @@ public class MallUserInfoController extends BaseController { currentUser.getId().equals(userInfo.getId())) { // 超管 MallUserInfo adminUser = new MallUserInfo(); - adminUser.setFlowPermission(userInfo.getFlowPermission()); adminUser.setEmail(userInfo.getEmail()); adminUser.setId(userInfo.getId()); if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { @@ -376,22 +375,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 contractUserList = userInfoService.findList(mallUserInfo); - - mallUserInfo.setFlowPermission(EnumFlowPermissionType.BILL.getCode()+""); - List billUserList = userInfoService.findList(mallUserInfo); - Map resultMap = new HashedMap(); - resultMap.put("contractUserList",contractUserList); - resultMap.put("billUserList",billUserList); - return new ResultData(resultMap); - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 1b35af1e6..3cd24b97c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -90,9 +90,6 @@ public class MallUserInfo extends BaseEntity { @Transient private String captcha; - @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") - private String flowPermission; - @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") private String email; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index 8a6b2908e..89d122ef9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -131,9 +131,6 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override public void saveOrUpdate(MallUserInfo record) { - if(StringUtils.isBlank(record.getFlowPermission())){ - record.setFlowPermission("[]"); - } if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index d5b152542..975c901c4 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -15,7 +15,6 @@ - @@ -78,9 +77,6 @@ and `web_open_id` = #{webOpenId} - - and JSON_CONTAINS(flow_permission->'$[*]', #{flowPermission}, '$') - and `email` = #{email} @@ -270,7 +266,6 @@ -