根据员工sid获取分公司sid、根据用户sid获取分公司sid、根据组织sid获取分公司sid

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -108,7 +108,7 @@ public interface SysOrganizationFeign {
     @ApiOperation("根据组织架构sid查询组织下所有分公司")
     @ResponseBody
     @GetMapping("/selectUseOrgSidBySid")
-    ResultBean<List<Map<String,String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid);
+    ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid);
 
     /**
      * 查询公司所有的部门
@@ -124,4 +124,9 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("查看二维码")
     public ResultBean<QrCodeVo> getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
+
+    @GetMapping("/getOrgSid/{sid}")
+    @ResponseBody
+    @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司")
+    ResultBean<String> getOrgSid(@PathVariable(value = "sid") String sid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -127,4 +127,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<QrCodeVo> getQrCode(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> getOrgSid(String sid) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java

@@ -74,10 +74,6 @@ public interface SysStaffOrgFeign {
     @GetMapping("/getSysStaffOrgSidListByStaffSid/{staffSid}")
     public ResultBean<String> getSysStaffOrgSidListByStaffSid(@PathVariable("staffSid") String staffSid);
 
-    @GetMapping("/selectSidPathByStaffSid")
-    @ResponseBody
-    @ApiModelProperty("根据员工sid获取部门全路径")
-    ResultBean<String> selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid);
 
     @GetMapping("/selectAllByStaffSid")
     @ResponseBody
@@ -92,6 +88,16 @@ public interface SysStaffOrgFeign {
      */
     @GetMapping("/getPathSidByUserSid")
     @ResponseBody
-    @ApiModelProperty("根据员工sid获取部门全路径")
+    @ApiOperation("根据用户sid获取分公司sid")
     ResultBean<String> getPathSidByUserSid(@RequestParam(value = "userSid") String applySid);
+
+    @GetMapping("/selectSidPathByStaffSid")
+    @ResponseBody
+    @ApiOperation("根据人员sid获取分公司sid")
+    ResultBean<String> selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid);
+
+    @GetMapping("/getOrgSidBySid")
+    @ResponseBody
+    @ApiOperation("根据组织sid获取分公司sid")
+    ResultBean<String> getOrgSidBySid(@RequestParam(value = "orgSid") String orgSid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java

@@ -85,6 +85,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<String> getOrgSidBySid(String orgSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
 		return null;

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

@@ -23,8 +23,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static cn.hutool.poi.excel.sax.AttributeName.s;
-
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysOrganizationFeignFallback.java <br/>
@@ -160,11 +158,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         }
         if (fgNames.length() > 1) {
             fgNames = fgNames.substring(1, fgNames.length());
-            fgSids = fgSids.substring(1,fgSids.length());
+            fgSids = fgSids.substring(1, fgSids.length());
         }
         if (zgNames.length() > 1) {
             zgNames = zgNames.substring(1, zgNames.length());
-            zgSids = zgSids.substring(1,zgSids.length());
+            zgSids = zgSids.substring(1, zgSids.length());
         }
         SysOrganizationVo vo = new SysOrganizationVo();
         BeanUtil.copyProperties(entity, vo);
@@ -268,7 +266,7 @@ public class SysOrganizationRest implements SysOrganizationFeign {
             SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(s);
             Integer isDept = sysOrganization1.getIsDept();
             String psid = sysOrganization1.getPsid();
-            if (isDept != null){
+            if (isDept != null) {
                 if (isDept == 0 && !psid.equals(0)) {
                     qrCodeVo.setOrganizationName(sysOrganization1.getName());
                     break;
@@ -277,4 +275,15 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         }
         return new ResultBean<QrCodeVo>().success().setData(qrCodeVo);
     }
+
+    @Override
+    public ResultBean<String> getOrgSid(String sid) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid);
+        if (sysOrganization == null) {
+            return rb.setMsg("该组织不存在");
+        }
+        String orgSid = sysOrganizationService.getOrgSid(sid);
+        return rb.success().setData(orgSid);
+    }
 }

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

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
-import com.yxt.anrui.portal.api.sysuser.SysUser;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -377,9 +375,22 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return baseMapper.getQrCodeVo(sid);
     }
 
-    public List<Map<String,String>> selectUseOrgSidBySid(String sid) {
+    public List<Map<String, String>> selectUseOrgSidBySid(String sid) {
         SysOrganization sysOrganization = fetchBySid(sid);
         String psid = sysOrganization.getPsid();
         return baseMapper.selectUseOrgSidBySid(psid);
     }
+
+    public String getOrgSid(String sid) {
+        SysOrganization sysOrganization = fetchBySid(sid);
+        String orgSid = "";
+        if ("0".equals(sysOrganization.getPsid())) {
+            orgSid = sysOrganization.getSid();
+            return orgSid;
+        }
+        if ("1".equals(sysOrganization.getIsDept())) {
+            return sysOrganization.getSid();
+        }
+        return getOrgSid(sid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml

@@ -43,8 +43,15 @@
           and sso.orgSid = #{orgSid}
     </select>
 
+    <!-- <select id="selectBySidPathByStaffSid" resultType="java.lang.String">
+         select orgSidPath
+         from anrui_portal.sys_staff_org
+         where staffSid = #{applySid}
+         order by id desc
+         limit 1
+     </select>-->
     <select id="selectBySidPathByStaffSid" resultType="java.lang.String">
-        select orgSidPath
+        select orgSid
         from anrui_portal.sys_staff_org
         where staffSid = #{applySid}
         order by id desc

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java

@@ -116,6 +116,13 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
         return sysStaffOrgService.selectSidPathByStaffSid(applySid);
     }
 
+    @Override
+    public ResultBean<String> getOrgSidBySid(String orgSid) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String orgPathSid = sysStaffOrgService.getOrgByOrgSid(orgSid);
+        return rb.success().setData(orgPathSid);
+    }
+
     @Override
     public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
         return sysStaffOrgService.selectAllByStaffSid(staffSid);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -165,7 +164,7 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         return baseMapper.getSysStaffOrgSidListByStaffSid(staffSid);
     }
 
-    public ResultBean<String> selectSidPathByStaffSid(String applySid) {
+    /*public ResultBean<String> selectSidPathByStaffSid(String applySid) {
         ResultBean<String> rb = ResultBean.fireFail();
         String orgSidPath = baseMapper.selectBySidPathByStaffSid(applySid);
         //根据部门路径循环遍历查询分公司的sid
@@ -179,6 +178,11 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
                         sid = list.get(i);
                         break;
                     }
+                } else {
+                    if ("0".equals(sysOrganization.getPsid())) {
+                        sid = list.get(i);
+                        break;
+                    }
                 }
             }
         }
@@ -186,6 +190,12 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
             return rb;
         }
         return rb.success().setData(sid);
+    }*/
+    public ResultBean<String> selectSidPathByStaffSid(String applySid) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String orgSid = baseMapper.selectBySidPathByStaffSid(applySid);
+        String orgPathSid = getOrgByOrgSid(orgSid);
+        return rb.success().setData(orgPathSid);
     }
 
     public ResultBean<SysStaffOrg> selectAllByStaffSid(String staffSid) {
@@ -213,4 +223,16 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         ResultBean<String> resultBean = selectSidPathByStaffSid(sysUserInfoVo.getStaffSid());
         return resultBean;
     }
+
+    public String getOrgByOrgSid(String orgSid) {
+        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+        if ("0".equals(sysOrganization.getPsid()) || sysOrganization == null) {
+            return "0";
+        }
+        if (sysOrganization.getIsDept() == 0) {
+            return sysOrganization.getSid();
+        }
+        return getOrgByOrgSid(sysOrganization.getPsid());
+
+    }
 }