导出安保部门从业人员 Excel 单位名称 导出 行社名称

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -792,18 +792,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysOrg sysOrg2 = orgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId());
         String findInSetOrder = this.handleFindInSetOrder(sysOrg2.getPath());
         List<SecurityUserExport> securityUserExports = userMapper.selectSecurityUser(sysOrg2.getPath(),findInSetOrder);
-        List<SysOrg> diquOrgs = orgService.list(new LambdaQueryWrapper<SysOrg>().likeRight(SysOrg::getShortName, "地区行社").eq(SysOrg::getIsLock, 0).eq(SysOrg::getDeleted, 0));
+//        List<SysOrg> diquOrgs = orgService.list(new LambdaQueryWrapper<SysOrg>().likeRight(SysOrg::getShortName, "地区行社").eq(SysOrg::getIsLock, 0).eq(SysOrg::getDeleted, 0));
         securityUserExports.forEach(s -> {
-            s.setCity("福建");
-            SysOrg sysOrg = sysOrgMapper.selectById(s.getOrgId());
-            Optional<SysOrg> diquOrg = diquOrgs.stream().filter(o -> sysOrg.getPath().startsWith(o.getPath())).findFirst();
-            if (diquOrg.isPresent()) {
-                String name = diquOrg.get().getName();
-                if (ObjectUtil.isNotEmpty(diquOrg.get().getShortName())) {
-                    name = diquOrg.get().getShortName();
-                }
-                s.setCity(name.substring(0, 2));
-            }
+//            s.setCity("福建");
+//            SysOrg sysOrg = sysOrgMapper.selectById(s.getOrgId());
+//            Optional<SysOrg> diquOrg = diquOrgs.stream().filter(o -> sysOrg.getPath().startsWith(o.getPath())).findFirst();
+//            if (diquOrg.isPresent()) {
+//                String name = diquOrg.get().getName();
+//                if (ObjectUtil.isNotEmpty(diquOrg.get().getShortName())) {
+//                    name = diquOrg.get().getShortName();
+//                }
+//                s.setCity(name.substring(0, 2));
+//            }
 //            SysOrg sysOrg1 = new SysOrg();
 //            if (sysOrg.getShortName().endsWith("地区行社")) {
 //                s.setCity(sysOrg.getBreviary());

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -734,7 +734,8 @@
     </select>
     <select id="selectSecurityUser" resultType="com.xunmei.system.util.SecurityUserExport">
         SELECT c.id                                     AS orgId,
-               c.short_name                             AS orgName,
+               c.affiliated_area                        AS city,
+               c.affiliated_bank                        AS orgName,
                b.`name`                                 AS name,
                IFNULL(b.gender, 2)                      AS gender,
                b.card                                   AS card,