Browse Source

主管分管更新员工修改以及合同多次生成

master
dimengzhe 3 years ago
parent
commit
973698752c
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java
  2. 97
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  3. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
  4. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
  5. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  6. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  7. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java
  8. 13
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
  9. 21
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java
  10. 130
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
  11. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
  12. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
  13. 15
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java

@ -88,4 +88,6 @@ public class CommonContractBuscenterVo implements Vo {
@ApiModelProperty("附件文件")
private List<CommonAppendixVo> pcCommonAppendixDtoList;
private String commonContractUrl;
}

97
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -1372,52 +1372,57 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
}
//生成合同数据
String finalUrl = url;
Future<String> future3 = pool.submit(() -> {
//新增合同信息
CommonContract commonContract = new CommonContract();
//合同编号
commonContract.setContractNo(contractNo);
//合同类型
if("现车".equals(appOrderDetailsVo.getOrderType())){
commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode());
commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks());
}else{
commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode());
commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks());
}
//客户sid
commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid());
//业务员sid、业务员
commonContract.setStaffSid(appOrderDetailsVo.getUserSid());
commonContract.setStaffName(appOrderDetailsVo.getSellerName());
//分公司sid
commonContract.setOrgSid(appOrderDetailsVo.getOrgSid());
//业务表sid
commonContract.setBusSid(dto.getBusSid());
//甲方名称、乙方名称、其他方名称、
commonContract.setPartyA(createOrgName);
commonContract.setPartyB(customerName);
//签订日期、签订地点
//订金、合同金额
commonContract.setDeposit(new BigDecimal(depositTotal));
commonContract.setContractAmount(depositTotal);
//合同附件
//身份证信息附件
//车型sid
commonContract.setModelSid(appOrderModelInfoVo.getModelSid());
//车型名称
commonContract.setModelName(appOrderModelInfoVo.getModelName());
//车辆台数
commonContract.setNum(Integer.valueOf(num).intValue());
//车辆单价
commonContract.setPrice(new BigDecimal(transactionPrice));
//单台订金
commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit()));
commonContract.setCommonContractUrl(finalUrl);
save(commonContract);
return commonContract.getSid();
});
//根据销售订单sid查询合同表中是否存在
CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
if (StringUtils.isBlank(commonContractBuscenterVo.getCommonContractUrl())) {
String finalUrl = url;
Future<String> future3 = pool.submit(() -> {
//新增合同信息
CommonContract commonContract = new CommonContract();
//合同编号
commonContract.setContractNo(contractNo);
//合同类型
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode());
commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks());
} else {
commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode());
commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks());
}
//客户sid
commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid());
//业务员sid、业务员
commonContract.setStaffSid(appOrderDetailsVo.getUserSid());
commonContract.setStaffName(appOrderDetailsVo.getSellerName());
//分公司sid
commonContract.setOrgSid(appOrderDetailsVo.getOrgSid());
//业务表sid
commonContract.setBusSid(dto.getBusSid());
//甲方名称、乙方名称、其他方名称、
commonContract.setPartyA(createOrgName);
commonContract.setPartyB(customerName);
//签订日期、签订地点
//订金、合同金额
commonContract.setDeposit(new BigDecimal(depositTotal));
commonContract.setContractAmount(depositTotal);
//合同附件
//身份证信息附件
//车型sid
commonContract.setModelSid(appOrderModelInfoVo.getModelSid());
//车型名称
commonContract.setModelName(appOrderModelInfoVo.getModelName());
//车辆台数
commonContract.setNum(Integer.valueOf(num).intValue());
//车辆单价
commonContract.setPrice(new BigDecimal(transactionPrice));
//单台订金
commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit()));
commonContract.setCommonContractUrl(finalUrl);
save(commonContract);
return commonContract.getSid();
});
}
} catch (Exception e) {
e.printStackTrace();
return rb.setMsg("生成文件失败");

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@ -94,7 +94,7 @@ public interface SysStaffinfoFeign {
*/
@ApiOperation("获取集团内全部员工姓名")
@GetMapping("/getStaffName")
public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName);
public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid);
/**
* 获取部门内全部员工姓名

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@ -54,7 +54,7 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
}
@Override
public ResultBean<List<Map<String, String>>> getStaffName(String staffName) {
public ResultBean<List<Map<String, String>>> getStaffName(String staffName,String deptSid) {
return null;
}

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -118,12 +118,12 @@ public class SysOrganizationRest implements SysOrganizationFeign {
}
//删除关联关系中的所有主管与分管的人员关系
sysStaffOrgService.delZGAndFGByOrgSid(sid);
if (StringUtils.isNotBlank(zgStaffSid)) {
/*if (StringUtils.isNotBlank(zgStaffSid)) {
ResultBean resultBean = sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", sysOrganization);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
}
}*/
if (StringUtils.isNotBlank(fgStaffSid)) {
ResultBean resultBean = sysOrganizationService.addSysStaffOrg(fgStaffSid, "2", sysOrganization);
if (!resultBean.getSuccess()) {

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@ -167,7 +167,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
int count = sysStaffOrgService.selectByStaffAndOrg(entity.getOrgSidPath(), sid, "3");
SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(sid);
if(count>0){
return rb.setMsg(sysStaffinfo.getName()+"已在本部门");
return rb.setMsg(sysStaffinfo.getName()+"已在本部门,不能设置分管");
}
}

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java

@ -55,4 +55,8 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
String getLevelType(String roleSid);
String selectRoleSid(String userRoleSid);
String selectByUserSid(String sid);
List<String> selectByUser(String userSid);
}

13
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml

@ -77,4 +77,17 @@
left join sys_role ssr on ssp.sid = ssr.postSid
where sr.sid = #{sid}
</select>
<select id="selectByUserSid" resultType="java.lang.String">
select GROUP_CONCAT(sr.name SEPARATOR '/') as roleName
from sys_user_role sur
left join sys_role sr on sur.roleSid = sr.sid
where sur.userSid = #{sid}
</select>
<select id="selectByUser" resultType="java.lang.String">
select roleSid
from sys_user_role
where userSid = #{userSid}
</select>
</mapper>

21
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java

@ -3,18 +3,15 @@ package com.yxt.anrui.portal.biz.sysrole;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import com.yxt.anrui.portal.api.sysrole.SysRole;
import com.yxt.anrui.portal.api.sysrole.SysRoleDto;
import com.yxt.anrui.portal.api.sysrole.SysRoleQuery;
import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.portal.api.sysrole.SysRole;
import com.yxt.anrui.portal.api.sysrole.SysRoleQuery;
import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
import com.yxt.anrui.portal.api.sysrole.SysRoleDto;
import com.yxt.anrui.portal.api.sysrole.SysRoleFeign;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@ -157,4 +154,12 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
public String selectRoleSid(String userRoleSid) {
return baseMapper.selectRoleSid(userRoleSid);
}
public String selectByUserSid(String sid) {
return baseMapper.selectByUserSid(sid);
}
public List<String> selectByUser(String userSid) {
return baseMapper.selectByUser(userSid);
}
}

130
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@ -9,21 +9,21 @@
SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
FROM sys_staffinfo staff
LEFT JOIN sys_user user
ON staff.sid = user.staffSid
ON staff.sid = user.staffSid
ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
</select>
<select id="searchAppContactsPageList"
resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsSearchVo">
SELECT staff.sid,
staff.name,
staff.mobile,
staff.position,
user.headImage,
GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
staff.name,
staff.mobile,
staff.position,
user.headImage,
GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
FROM sys_staffinfo staff
LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
LEFT JOIN sys_user user ON staff.sid = user.staffSid
LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
LEFT JOIN sys_user user ON staff.sid = user.staffSid
WHERE 1 = 1
<if test="mobileStr != null and mobileStr != ''">
AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
@ -49,8 +49,8 @@
GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
FROM sys_staffinfo staff
LEFT JOIN sys_user user
ON staff.sid = user.staffSid
LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
ON staff.sid = user.staffSid
LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
WHERE staff.sid = #{staffSid}
GROUP BY staff.sid
</select>
@ -68,14 +68,15 @@
FROM sys_staff_org org
INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
LEFT JOIN sys_user user
ON staff.sid = user.staffSid
ON staff.sid = user.staffSid
WHERE org.orgSid = #{sid}
</select>
<!--根据员工类型key查询员工工号的最大号-->
<select id="selectJobNumber" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
select *
from sys_staffinfo
order by jobNumber desc limit 1
order by jobNumber desc
limit 1
</select>
<!--根据手机号查询员工是否重复-->
<select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@ -104,24 +105,24 @@
DATE_FORMAT(si.joinCompnyDate, '%Y-%m-%d') AS joinCompnyDate,
<!--所在部门-->
(select GROUP_CONCAT(orgName SEPARATOR ',') orgName from sys_staff_org so where so.staffSid = si.sid) as
orgName,
orgName,
<!--所在部门sid-->
(select GROUP_CONCAT(orgSid SEPARATOR ',') orgSid from sys_staff_org so where so.staffSid = si.sid) as
orgSid,
orgSid,
<!--岗位-->
(select GROUP_CONCAT(sp.name SEPARATOR ',') postName
from sys_staff_post ssp
left join sys_post sp on
sp.sid =
ssp.postSid
where ssp.staffSid = si.sid
group by ssp.id) as postName
from sys_staff_post ssp
left join sys_post sp on
sp.sid =
ssp.postSid
where ssp.staffSid = si.sid
group by ssp.id) as postName
from sys_staffinfo si
LEFT JOIN sys_staff_org so
ON so.staffSid = si.sid
LEFT JOIN sys_staff_post ssp
ON ssp.staffSid = si.sid
${ew.customSqlSegment}
LEFT JOIN sys_staff_org so
ON so.staffSid = si.sid
LEFT JOIN sys_staff_post ssp
ON ssp.staffSid = si.sid
${ew.customSqlSegment}
</select>
<!--根据员工手机号和sid查询员工信息是否已存在-->
<select id="selectByMobileAndSid" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@ -249,8 +250,8 @@
isHaveInsurance,
<!--意外险参保:1是,0否-->
case isHaveInsurance
when 1 then '是'
when 0 then '否' end as isHaveInsuranceValue,
when 1 then '是'
when 0 then '否' end as isHaveInsuranceValue,
<!--意外险参保时间-->
DATE_FORMAT(insuranceStartDate, '%Y-%m-%d') as insuranceStartDate,
<!--意外险参保终止日期-->
@ -261,26 +262,26 @@
isHaveAged,
<!--养老:1是,0否-->
case isHaveAged
when 1 then '是'
when 0 then '否' end as isHaveAgedValue,
when 1 then '是'
when 0 then '否' end as isHaveAgedValue,
<!--医疗:1是,0否-->
isHaveMedical,
<!--医疗:1是,0否-->
case isHaveMedical
when 1 then '是'
when 0 then '否' end as isHaveMedicalValue,
when 1 then '是'
when 0 then '否' end as isHaveMedicalValue,
<!--工伤:1是,0否-->
isHaveInjury,
<!--工伤:1是,0否-->
case isHaveInjury
when 1 then '是'
when 0 then '否' end as isHaveInjuryValue,
when 1 then '是'
when 0 then '否' end as isHaveInjuryValue,
<!--失业:1是,0否-->
isHaveUnemploy,
<!--失业:1是,0否-->
case isHaveUnemploy
when 1 then '是'
when 0 then '否' end as isHaveUnemployValue,
when 1 then '是'
when 0 then '否' end as isHaveUnemployValue,
<!--社保参保地-->
insuredPlace,
<!--纸质档案保管地-->
@ -314,8 +315,11 @@
</select>
<select id="getStaffName" resultType="java.util.Map">
SELECT sid, name
FROM sys_staffinfo ${ew.customSqlSegment}
SELECT DISTINCT ss.sid, ss.name
FROM sys_staffinfo ss
LEFT JOIN sys_staff_org sso
ON ss.`sid` = sso.`staffSid`
${ew.customSqlSegment}
</select>
<select id="getStaffNameByDeptSid" resultType="java.util.Map">
@ -328,46 +332,46 @@
</select>
<select id="getUserList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo">
select su.sid userSid,
si.name userName,
su.headImage,
si.mobile userMobile,
sso.orgName as department,
sp.name
select su.sid userSid,
si.name userName,
su.headImage,
si.mobile userMobile,
sso.orgName as department,
sp.name
from sys_staff_org sso
left join sys_staffinfo si on sso.staffSid = si.sid
left join sys_user su on si.sid = su.staffSid
left join sys_staff_post ssp on si.sid = ssp.staffSid
left join sys_post sp on sp.sid = ssp.postSid
left join sys_staffinfo si on sso.staffSid = si.sid
left join sys_user su on si.sid = su.staffSid
left join sys_staff_post ssp on si.sid = ssp.staffSid
left join sys_post sp on sp.sid = ssp.postSid
<where>
${ew.sqlSegment}
<if test="orgSid != null and orgSid != ''">
and find_in_set(#{orgSid}
, replace (sso.orgSidPath
, '/'
, ','))
, replace (sso.orgSidPath
, '/'
, ','))
</if>
</where>
</select>
<select id="getGressionUserList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo">
select su.sid as userSid,
si.name as userName,
su.headImage,
si.mobile as userMobile,
sso.orgName as department,
sp.name
select su.sid as userSid,
si.name as userName,
su.headImage,
si.mobile as userMobile,
sso.orgName as department,
sp.name
from sys_staff_org sso
left join sys_staffinfo si on sso.staffSid = si.sid
left join sys_user su on si.sid = su.staffSid
left join sys_staff_post ssp on si.sid = ssp.staffSid
left join sys_post sp on sp.sid = ssp.postSid
left join sys_staffinfo si on sso.staffSid = si.sid
left join sys_user su on si.sid = su.staffSid
left join sys_staff_post ssp on si.sid = ssp.staffSid
left join sys_post sp on sp.sid = ssp.postSid
<where>
<if test="userOrgSid != null and userOrgSid != ''">
and find_in_set(#{userOrgSid}
, replace (sso.orgSidPath
, '/'
, ','))
, replace(sso.orgSidPath
, '/'
, ','))
</if>
</where>
</select>

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@ -135,9 +135,9 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
}
@Override
public ResultBean<List<Map<String, String>>> getStaffName(String staffName) {
public ResultBean<List<Map<String, String>>> getStaffName(String staffName,String deptSid) {
ResultBean rb = ResultBean.fireFail();
List<Map<String, String>> staffNameList = sysStaffinfoService.getStaffName(staffName);
List<Map<String, String>> staffNameList = sysStaffinfoService.getStaffName(staffName,deptSid);
return rb.success().setData(staffNameList);
}

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@ -605,12 +605,13 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
return rb.success().setData(list);
}
public List<Map<String, String>> getStaffName(String staffName) {
public List<Map<String, String>> getStaffName(String staffName,String deptSid) {
QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(staffName)) {
qw.like("name", staffName);
qw.like("ss.name", staffName);
}
qw.eq("isDelete", 0);
qw.eq("ss.isDelete", 0);
qw.ne("sso.orgSid", deptSid);
return baseMapper.getStaffName(qw);
}

15
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@ -8,7 +8,6 @@ import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
import com.yxt.anrui.portal.api.sms.SmsFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysrole.SysRoleQuery;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -337,7 +336,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
String psid = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()).getPsid();
String name = sysOrganizationService.fetchBySid(psid).getName();
userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName() + " " + userInfoOneVo.getPostName());
// userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName() + " " + userInfoOneVo.getPostName());
userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid());
userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName());
userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
@ -348,8 +348,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
// 设置用户的角色sids
List<String> roleSids = this.getUserRoleSids(user.getSid());
userInfoOneVo.setRoleSids(roleSids);
if (userInfoOneVo.getRoleSids().contains("000003") || userInfoOneVo.getRoleSids().contains("000004")) {
}
String roleName = sysRoleService.selectByUserSid(user.getSid());
userInfoOneVo.setRoleName(roleName);
return userInfoOneVo;
}
@ -385,12 +385,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
* @return
*/
public List<String> getUserRoleSids(String userSid) {
List<String> list = new ArrayList<>();
List<String> orgTypeKeys = new ArrayList<>();
SysRoleQuery roleQuery = new SysRoleQuery();
//用户类别来区分是系统管理、单位管理员1、单位一般用户2、尚无单位用户
roleQuery.setType(1);
return list;
return sysRoleService.selectByUser(userSid);
}
public SysUser fetchByUserName(String mobile) {

Loading…
Cancel
Save