|
|
@ -306,7 +306,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
int i = baseMapper.updatePasswordWx(user.getSid(), Encodes.md5(newPassword)); |
|
|
|
SysUserVo sysUserVo = new SysUserVo(); |
|
|
|
SysUser sysUser = fetchBySid(user.getSid()); |
|
|
|
BeanUtil.copyProperties(sysUser,sysUserVo); |
|
|
|
BeanUtil.copyProperties(sysUser, sysUserVo); |
|
|
|
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.selByMobile(sysUser.getMobile()).getData(); |
|
|
|
sysUserVo.setName(crmCustomerTempVo.getName()); |
|
|
|
//查询是否需要更换密码
|
|
|
@ -1544,6 +1544,41 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
return rb.success().setData(defalutId); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<PrivilegeVo> selectPrivilegeLevelPath(PrivilegeQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
ResultBean<String> defaultIdReltBean = selectPrivilegeLevel(query); |
|
|
|
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { |
|
|
|
PrivilegeVo privilegeVo = new PrivilegeVo(); |
|
|
|
String orgLevelKey = defaultIdReltBean.getData(); |
|
|
|
privilegeVo.setOrgLevelKey(orgLevelKey); |
|
|
|
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
|
|
|
|
String orgSidPath = query.getOrgPath(); |
|
|
|
orgSidPath = orgSidPath + "/"; |
|
|
|
int i1 = orgSidPath.indexOf("/"); |
|
|
|
int i2 = orgSidPath.indexOf("/", i1 + 1); |
|
|
|
int i3 = orgSidPath.indexOf("/", i2 + 1); |
|
|
|
int i4 = orgSidPath.indexOf("/", i3 + 1); |
|
|
|
String levelPath = ""; |
|
|
|
if ("1".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i1); |
|
|
|
levelPath = orgSidPath; |
|
|
|
} else if ("2".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i2); |
|
|
|
levelPath = orgSidPath; |
|
|
|
} else if ("3".equals(orgLevelKey)) { |
|
|
|
orgSidPath = orgSidPath.substring(0, i3); |
|
|
|
levelPath = orgSidPath; |
|
|
|
} else if ("4".equals(orgLevelKey)) { |
|
|
|
levelPath = query.getOrgPath(); |
|
|
|
} else if ("5".equals(orgLevelKey)) { |
|
|
|
levelPath = query.getUserSid(); |
|
|
|
} |
|
|
|
privilegeVo.setLevelPath(levelPath); |
|
|
|
return rb.success().setData(privilegeVo); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<String>> getUserSidByRole(UserQuery query) { |
|
|
|
ResultBean<List<String>> rb = ResultBean.fireFail(); |
|
|
|
List<String> sysUserVoList = new ArrayList<>(); |
|
|
@ -1683,4 +1718,4 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|