| @@ -193,7 +193,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) { | ||||
| @@ -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<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); | |||||
| } | |||||
| } | } | ||||
| @@ -90,9 +90,6 @@ public class MallUserInfo extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private String captcha; | private String captcha; | ||||
| @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") | |||||
| private String flowPermission; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") | @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") | ||||
| private String email; | private String email; | ||||
| @@ -131,9 +131,6 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { | |||||
| @Override | @Override | ||||
| public void saveOrUpdate(MallUserInfo record) { | public void saveOrUpdate(MallUserInfo record) { | ||||
| if(StringUtils.isBlank(record.getFlowPermission())){ | |||||
| record.setFlowPermission("[]"); | |||||
| } | |||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -15,7 +15,6 @@ | |||||
| <result column="phone" jdbcType="VARCHAR" property="phone"/> | <result column="phone" jdbcType="VARCHAR" property="phone"/> | ||||
| <result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> | <result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> | ||||
| <result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> | <result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> | ||||
| <result column="flow_permission" property="flowPermission"/> | |||||
| <result column="email" property="email"/> | <result column="email" property="email"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -78,9 +77,6 @@ | |||||
| <if test=" null != webOpenId "> | <if test=" null != webOpenId "> | ||||
| and `web_open_id` = #{webOpenId} | and `web_open_id` = #{webOpenId} | ||||
| </if> | </if> | ||||
| <if test=" null != flowPermission "> | |||||
| and JSON_CONTAINS(flow_permission->'$[*]', #{flowPermission}, '$') | |||||
| </if> | |||||
| <if test=" null != email "> | <if test=" null != email "> | ||||
| and `email` = #{email} | and `email` = #{email} | ||||
| </if> | </if> | ||||
| @@ -270,7 +266,6 @@ | |||||
| <result column="phone" jdbcType="VARCHAR" property="phone"/> | <result column="phone" jdbcType="VARCHAR" property="phone"/> | ||||
| <result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> | <result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/> | ||||
| <result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> | <result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/> | ||||
| <result column="flow_permission" property="flowPermission"/> | |||||
| <result column="email" property="email"/> | <result column="email" property="email"/> | ||||
| <result column="mall_name" jdbcType="VARCHAR" property="mallName"/> | <result column="mall_name" jdbcType="VARCHAR" property="mallName"/> | ||||