Default Changelist

dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserOrgDao.java

@@ -55,4 +55,6 @@ public interface SysUserOrgDao extends BaseMapper<SysUserOrgEntity> {
      *            用户id
      */
     List<SysCompanyEntity> getOrgsByUserId(Long userId);
+
+    List<SysCompanyEntity> getEmailOrgsByUserId(Long userId);
 }

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/SysUserOrgService.java

@@ -69,4 +69,6 @@ public interface SysUserOrgService extends IService<SysUserOrgEntity> {
      */
     List<SysCompanyEntity> getOrgsByUserId(Long userId);
 
+    List<SysCompanyEntity> getEmailOrgsByUserId(Long userId);
+
 }

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserOrgServiceImpl.java

@@ -89,6 +89,13 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgDao, SysUserOrg
         return baseMapper.getOrgsByUserId(userId);
     }
 
+    @Override
+    public List<SysCompanyEntity> getEmailOrgsByUserId(Long userId) {
+        DynamicContextHolder.push(DbConstant.BASICS_WRITE);
+
+        return baseMapper.getEmailOrgsByUserId(userId);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void deleteUserOrg(Long userId) {
         baseMapper.delete(new QueryWrapper<SysUserOrgEntity>().eq("userid", userId));

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java

@@ -326,7 +326,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             }
             //获取组织编码
             List<SysCompanyEntity> companyEntitys = sysUserOrgService.getOrgsByUserId(userEntity.getUserId());
-            List<SysCompanyEntity> emailCodes = new ArrayList<>();
             if (companyEntitys != null && companyEntitys.size() > 0) {
                 for (SysCompanyEntity companyEntity : companyEntitys) {
                     if (companyEntity != null) {
@@ -340,8 +339,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
 //                company.setCompanyName("()暂无组织编码发票");
 //                company.setCompanyCode("88");
 //                companyEntitys.add(company);
-                List<SysCompanyEntity> collect = companyEntitys.stream().filter(e -> StringUtils.isNotBlank(e.getGfsh())).collect(Collectors.toList());
-                emailCodes = JSONObject.parseArray(collect.toString()).toJavaList(SysCompanyEntity.class);
             }
 
             user = this.toUser(user, userEntity);
@@ -349,10 +346,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             user.setUserOrg(userOrgEntity);
             user.setUserBusiness(businessList);
             user.setCompanyCodes(companyEntitys);
-            user.setEmailCodes(emailCodes);
             user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
             // 刷新菜单缓存处理
             this.setMetnuRedis(userEntity.getUserId());
+            user.setEmailCodes(sysUserOrgService.getEmailOrgsByUserId(userEntity.getUserId()));
         } catch (Exception e) {
             e.printStackTrace();
         }

dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml

@@ -79,4 +79,11 @@
         where org.userid = #{userId}
     </select>
 
+    <select id="getEmailOrgsByUserId" parameterType="long" resultType="com.dxhy.admin.sys.entity.SysCompanyEntity">
+        select dept.org_code as companyCode,dept.name as companyName,dept.dept_id as deptId,dept.taxno gfsh from sys_user_org org
+        inner join sys_dept dept on org.dept_id = dept.dept_id
+        where org.userid = #{userId}
+        and dept.taxno != ''
+    </select>
+
 </mapper>