diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserOrgDao.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserOrgDao.java index a65bab59..e9e30a39 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserOrgDao.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserOrgDao.java @@ -2,6 +2,7 @@ package com.dxhy.admin.sys.dao; import java.util.List; +import com.dxhy.admin.sys.entity.SysCompanyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -46,4 +47,12 @@ public interface SysUserOrgDao extends BaseMapper { * 部门id */ void updateDeptId(@Param("taxno") String taxno, @Param("taxname") String taxname, @Param("deptId") Long deptId); + + /** + * 获取登陆用户对应的所有组织 + * + * @param userId + * 用户id + */ + List getOrgsByUserId(Long userId); } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java new file mode 100644 index 00000000..da980e50 --- /dev/null +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java @@ -0,0 +1,14 @@ +package com.dxhy.admin.sys.entity; + +import lombok.Data; + +@Data +public class SysCompanyEntity { + private static final long serialVersionUID = 1L; + + //组织编码 + private String companyCode; + + //组织名称 + private String companyName; +} diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java index f6e832ef..c0c8ca7a 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java @@ -3,10 +3,7 @@ package com.dxhy.admin.sys.model; import java.io.Serializable; import java.util.List; -import com.dxhy.admin.sys.entity.SysDeptEntity; -import com.dxhy.admin.sys.entity.SysRoleEntity; -import com.dxhy.admin.sys.entity.SysUserBusinessEntity; -import com.dxhy.admin.sys.entity.SysUserOrgEntity; +import com.dxhy.admin.sys.entity.*; import com.dxhy.common.vo.TaxOrgCode; import lombok.Data; @@ -45,12 +42,15 @@ public class User implements Serializable { private List roles; private List userOrg; + private List orgCodes; private List userBusiness; private List userModels; + private List companyCodes; + private String qsStatus; private String webscoketUrl; diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/SysUserOrgService.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/SysUserOrgService.java index 9ecd41c9..eb552e13 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/SysUserOrgService.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/SysUserOrgService.java @@ -3,6 +3,7 @@ package com.dxhy.admin.sys.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; +import com.dxhy.admin.sys.entity.SysCompanyEntity; import com.dxhy.admin.sys.entity.SysDeptEntity; import com.dxhy.admin.sys.entity.SysUserOrgEntity; @@ -60,4 +61,12 @@ public interface SysUserOrgService extends IService { */ void delete(Long userId); + /** + * 获取登录用户对应的所有组织 + * + * @param userId + * 用户id + */ + List getOrgsByUserId(Long userId); + } diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserOrgServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserOrgServiceImpl.java index 9591efff..1bbf8a3f 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserOrgServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserOrgServiceImpl.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import com.dxhy.admin.sys.entity.SysCompanyEntity; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -81,6 +82,13 @@ public class SysUserOrgServiceImpl extends ServiceImpl getOrgsByUserId(Long userId) { + DynamicContextHolder.push(DbConstant.BASICS_WRITE); + + return baseMapper.getOrgsByUserId(userId); + } + @Transactional(rollbackFor = Exception.class) public void deleteUserOrg(Long userId) { baseMapper.delete(new QueryWrapper().eq("userid", userId)); diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index f7a78858..83d666f7 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -4,6 +4,7 @@ import java.util.*; import javax.annotation.Resource; +import com.dxhy.common.util.StringHelper; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -282,10 +283,24 @@ public class SysUserServiceImpl extends ServiceImpl i } } } + //获取组织编码 + List companyEntitys = sysUserOrgService.getOrgsByUserId(userEntity.getUserId()); + if (companyEntitys != null && companyEntitys.size() > 0){ + for (SysCompanyEntity companyEntity : companyEntitys) { + if (companyEntity != null) { + if (StringHelper.isNotBlank(companyEntity.getCompanyCode()) && StringHelper.isNotBlank(companyEntity.getCompanyName())){ + String companyName ="("+companyEntity.getCompanyCode()+")"+companyEntity.getCompanyName(); + companyEntity.setCompanyName(companyName); + } + } + } + } + user = this.toUser(user, userEntity); user.setPassword(""); user.setUserOrg(userOrgEntity); user.setUserBusiness(businessList); + user.setCompanyCodes(companyEntitys); user.setUserModels(this.getUserCompanyList(userEntity.getCompany())); // 刷新菜单缓存处理 diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml index 7e152c4c..57e81297 100644 --- a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml +++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml @@ -72,4 +72,11 @@ where dept_id = #{deptId} + +