diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/OrgVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/OrgVo.java new file mode 100644 index 0000000000..6329c6634c --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/OrgVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.portal.api.sysstafforg; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/9 + **/ +@Data +public class OrgVo { + + private String useOrgSid; + + private String useOrgName; + + private String deptName; + + private String deptSid; + private String orgCode; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index a76021ac67..ebbce096c8 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -101,6 +101,7 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiOperation("根据组织sid获取分公司sid") ResultBean getOrgSidBySid(@RequestParam(value = "orgSid") String orgSid); + @GetMapping("/getOrgByStaffSid") @ResponseBody @ApiOperation("根据组织staffSid获取分公司SysStaffOrg") @@ -119,11 +120,15 @@ public interface SysStaffOrgFeign { @PostMapping("/selAllByOrgPath") @ResponseBody @ApiOperation("根据分公司全路径和角色sid模糊查询本公司本角色下的所有员工userSid") - ResultBean> selAllByOrgPath(@RequestParam("orgSidPath") String orgSidPath,@RequestParam("roleSid") String roleSid); + ResultBean> selAllByOrgPath(@RequestParam("orgSidPath") String orgSidPath, @RequestParam("roleSid") String roleSid); @PostMapping("/selAllByOrgSidPath") @ResponseBody @ApiOperation("根据组织全路径查询当前部门下的所有员工") ResultBean> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath); + @GetMapping("/getOrgByPath") + @ResponseBody + @ApiOperation("根据组织全路径查询组织") + ResultBean getOrgByPath(@RequestParam("orgSidPath") String orgSidPath); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index 0e282db848..2f5062ccca 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -115,6 +115,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { return null; } + @Override + public ResultBean getOrgByPath(String orgSidPath) { + return null; + } + @Override public ResultBean selectAllByStaffSid(String staffSid) { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java index 09d57c24de..0ec4fc98be 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgByUserVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo; @@ -119,4 +120,6 @@ public interface SysStaffOrgMapper extends BaseMapper { List selAllByOrgPath(@Param(Constants.WRAPPER) QueryWrapper qw); List selAllByOrgSidPath(String orgSidPath); + + SysOrganization selectOrgSidPath(String orgSidPath); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml index 81da53369a..d2a165fe45 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -158,4 +158,8 @@ ON so.`staffSid` = ss.`sid` WHERE so.`orgSidPath` = #{orgSidPath} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index 3dc71e84c6..7988cc6b0d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -141,8 +141,8 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { } @Override - public ResultBean> selAllByOrgPath(String orgSidPath,String roleSid) { - return sysStaffOrgService.selAllByOrgPath(orgSidPath,roleSid); + public ResultBean> selAllByOrgPath(String orgSidPath, String roleSid) { + return sysStaffOrgService.selAllByOrgPath(orgSidPath, roleSid); } @Override @@ -159,4 +159,9 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { public ResultBean getPathSidByUserSid(String applySid) { return sysStaffOrgService.getPathSidByUserSid(applySid); } + + @Override + public ResultBean getOrgByPath(String orgSidPath) { + return sysStaffOrgService.getOrgByPath(orgSidPath); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index e31f0a02f0..79082592f9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -247,7 +247,7 @@ public class SysStaffOrgService extends MybatisBaseService selectStaffByOrgSid(String sid, String type) { - return baseMapper.selectStaffByOrgSid(sid,type); + return baseMapper.selectStaffByOrgSid(sid, type); } public List selectStaffByOrg(String orgSid) { return baseMapper.selectStaffByOrg(orgSid); } - public ResultBean> selAllByOrgPath(String orgSidPath,String roleSid) { + public ResultBean> selAllByOrgPath(String orgSidPath, String roleSid) { ResultBean rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("sur.roleSid",roleSid); - qw.like("sso.orgSidPath",orgSidPath); + qw.eq("sur.roleSid", roleSid); + qw.like("sso.orgSidPath", orgSidPath); List sysStaffOrgByUserVos = baseMapper.selAllByOrgPath(qw); return rb.success().setData(sysStaffOrgByUserVos); } @@ -340,4 +340,27 @@ public class SysStaffOrgService extends MybatisBaseService sysStaffOrgByUserVoList = baseMapper.selAllByOrgSidPath(orgSidPath); return rb.success().setData(sysStaffOrgByUserVoList); } + + public ResultBean getOrgByPath(String orgSidPath) { + ResultBean rb = ResultBean.fireFail(); + OrgVo orgVo = new OrgVo(); + List stringList = Arrays.asList(orgSidPath.split("/")); + //根据orgSidPath查询该组织的层级 + SysOrganization sysOrganization = baseMapper.selectOrgSidPath(orgSidPath); + if ("1".equals(sysOrganization.getOrgLevelKey())) { + sysOrganization = sysOrganizationService.fetchBySid(stringList.get(0)); + } else if ("2".equals(sysOrganization.getOrgLevelKey())) { + sysOrganization = sysOrganizationService.fetchBySid(stringList.get(1)); + } else { + sysOrganization = sysOrganizationService.fetchBySid(stringList.get(2)); + } + orgVo.setUseOrgName(sysOrganization.getName()); + orgVo.setUseOrgSid(sysOrganization.getSid()); + orgVo.setOrgCode(sysOrganization.getOrgCode()); + String lastPart = orgSidPath.contains("/") ? orgSidPath.substring(orgSidPath.lastIndexOf("/") + 1) : orgSidPath; + sysOrganization = sysOrganizationService.fetchBySid(lastPart); + orgVo.setDeptName(sysOrganization.getName()); + orgVo.setDeptSid(sysOrganization.getSid()); + return rb.success().setData(orgVo); + } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java index 784e8ad531..01b2c08ca4 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java @@ -81,17 +81,9 @@ public class OaMendApplyRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { ResultBean rb = ResultBean.fireFail(); - OaMendApplyDetailsVo vo = oaMendApplyService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @ApiOperation("初始化") - @GetMapping("/init") - public ResultBean init(@RequestParam(value = "sid", required = false) String sid, @RequestParam("orgPath") String orgPath) { - ResultBean rb = ResultBean.fireFail(); - OaMendApplyInitVo vo = oaMendApplyService.init(sid, orgPath); + OaMendApplyVo vo = oaMendApplyService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java index ecc44bc7fe..2ca5b6300b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java @@ -37,7 +37,13 @@ public class OaAppendixService extends MybatisBaseService oaAppendixList) { + baseMapper.deleteByLinkSid(sid); + if (!oaAppendixList.isEmpty()) { + oaAppendixList.forEach(v -> { + baseMapper.insert(v); + }); + } + } } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java index 0f63d0afb8..9cfcbed3ef 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java @@ -22,5 +22,5 @@ public interface OaFormMapper extends BaseMapper { int updateFlowFiled(Map map); - String selectNum(String billNo); + int selectNum(String bill); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml index 4d868d102b..fd53248d2c 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml @@ -32,11 +32,9 @@ WHERE sid = #{sid} - + select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code from oa_form - where billNo LIKE concat(#{billNo}, '%') - order by billNo desc - limit 1 + where billNo LIKE concat(#{bill}, '%') \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java index aa2b0432a1..ccbf4ece68 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.oa.biz.oaform.flowable.*; +import com.yxt.anrui.oa.feign.base.BillNo; import com.yxt.anrui.oa.feign.base.Rule; import com.yxt.anrui.oa.feign.flowable.flow.BusinessVariables; import com.yxt.anrui.oa.feign.flowable.flow.FlowableFeign; @@ -21,6 +22,7 @@ import com.yxt.anrui.oa.feign.message.MessageFlowVo; import com.yxt.anrui.oa.feign.message.MessageFlowableQuery; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.anrui.oa.feign.portal.sysstafforg.OrgVo; import com.yxt.anrui.oa.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.oa.feign.sysuser.SysUserFeign; import com.yxt.anrui.oa.feign.sysuser.SysUserVo; @@ -80,38 +82,19 @@ public class OaFormService extends MybatisBaseService { public ResultBean saveOaForm(OaFormDto dto) { ResultBean rb = ResultBean.fireFail(); OaForm oaForm = new OaForm(); - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath()).getData(); - SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); - String deptName = ""; - String deptSid = ""; - List split = Arrays.asList(dto.getOrgSidPath().split("/")); - - if (split.size() > 1) { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - deptName = sysOrganization1.getName(); - deptSid = sysOrganization1.getSid(); - } else { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - deptName = sysOrganization.getName(); - deptSid = sysOrganization.getSid(); - } + OrgVo orgVo = sysStaffOrgFeign.getOrgByPath(dto.getOrgSidPath()).getData(); + BeanUtil.copyProperties(orgVo, oaForm); // 生成单据编号 - String billNo = dto.getBillNo() + useOrgSid + DateUtil.format(DateUtil.date(), "yyyyMM"); - String i = selectNum(billNo); - if (StringUtils.isNotBlank(i)) { - billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); - } else { - billNo = Rule.getBillNo(billNo, 0); - } - - oaForm.setUseOrgSid(useOrgSid); - oaForm.setUseOrgName(organizationVo.getName()); - oaForm.setDeptSid(deptSid); - oaForm.setDeptName(deptName); + BillNo b = new BillNo(); + b.setOrgCode(orgVo.getOrgCode()); + b.setBillType("BKSQ"); + String bill = Rule.getBill(b); + int i = baseMapper.selectNum(bill); + String billNo = Rule.getBillNo(bill, i); oaForm.setBillNo(billNo); - oaForm.setCreateOrgSid(useOrgSid); - oaForm.setCreateOrgName(organizationVo.getName()); + oaForm.setCreateBySid(dto.getCreateBySid()); + oaForm.setCreateOrgSid(oaForm.getUseOrgSid()); + oaForm.setCreateOrgName(oaForm.getUseOrgName()); // 获取用户信息 SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getCreateBySid()).getData(); @@ -417,8 +400,4 @@ public class OaFormService extends MybatisBaseService { public int updateFormType(OaForm oaForm) { return baseMapper.updateById(oaForm); } - - public String selectNum(String billNo) { - return baseMapper.selectNum(billNo); - } } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java index 3aae790876..9295868046 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java @@ -55,8 +55,6 @@ public interface OaMendApplyMapper extends BaseMapper { int selectBySid(String join); + OaMendApplyVo fetchDetailsVoBySid(String sid); - OaMendApplyDetailsVo fetchDetailsVoBySid(String sid); - - OaMendApplyInitVo init(String sid); } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml index 5336ba2aa3..ac8a2f1ff7 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml @@ -4,9 +4,10 @@ - + SELECT oa.sid, oa.remarks, - ofm.billNo, - ofm.createByName, - ofm.createBySid, - ofm.deptSid, - ofm.deptName, oa.time, - ofm.useOrgSid, - ofm.useOrgName - from oa_menu_apply oa - left join oa_form ofm on oa.formSid = ofm.sid - where oa.sid = #{sid} - - - diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java index 0231345648..57169260e8 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java @@ -45,8 +45,6 @@ import com.yxt.anrui.oa.feign.message.MessageFlowVo; import com.yxt.anrui.oa.feign.message.MessageFlowableQuery; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; -import com.yxt.anrui.oa.feign.portal.sysstafforg.SysStaffOrgFeign; -import com.yxt.anrui.oa.feign.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -150,24 +148,19 @@ public class OaMendApplyService extends MybatisBaseService rb = ResultBean.fireFail(); String sid = dto.getSid(); List files = dto.getFiles(); - if (StringUtils.isBlank(sid)) { // 新建操作 OaMendApply entity = new OaMendApply(); BeanUtil.copyProperties(dto, entity, "sid"); - OaFormDto oaFormDto = new OaFormDto(); BeanUtil.copyProperties(dto, oaFormDto, "sid"); oaFormDto.setBillNo("BKSQ"); ResultBean resultBean = oaFormService.saveOaForm(oaFormDto); - if (!resultBean.getSuccess()) { return rb; } - entity.setFormSid(resultBean.getData()); baseMapper.insert(entity); - // 处理附件 saveFiles(sid, files); sid = entity.getSid(); @@ -176,6 +169,8 @@ public class OaMendApplyService extends MybatisBaseService files) { - if (files == null || files.isEmpty()) { - return; // 如果没有文件，不做任何操作 + files.removeAll(Collections.singleton(null)); + List oaAppendixList = new ArrayList<>(); + if (!files.isEmpty()) { + for (String file : files) { + String filePath = file.replace(fileUploadComponent.getUrlPrefix(), ""); + OaAppendix oaAppendix = new OaAppendix(); + oaAppendix.setLinkSid(sid); + oaAppendix.setAttachType(OaFileEnum.OAMENDAPPLY.getAttachType()); + oaAppendix.setFilePath(filePath); + oaAppendixList.add(oaAppendix); + } } - oaAppendixService.deleteByLinkSid(sid); + oaAppendixService.saveOrUpdateFile(sid, oaAppendixList); - for (String file : files) { - String filePath = file.replace(fileUploadComponent.getUrlPrefix(), ""); - OaAppendix oaAppendix = new OaAppendix(); - oaAppendix.setLinkSid(sid); - oaAppendix.setAttachType(OaFileEnum.OAMENDAPPLY.getAttachType()); - oaAppendix.setFilePath(filePath); - oaAppendixService.save(oaAppendix); - } } - public OaMendApplyDetailsVo fetchDetailsVoBySid(String sid) { - OaMendApplyDetailsVo vo = baseMapper.fetchDetailsVoBySid(sid); + public OaMendApplyVo fetchDetailsVoBySid(String sid) { + OaMendApplyVo vo = baseMapper.fetchDetailsVoBySid(sid); List oaAppendices = oaAppendixService.fetchByLinkSid(sid); List files = new ArrayList<>(); for (OaAppendix oaAppendix : oaAppendices) { @@ -335,10 +331,4 @@ public class OaMendApplyService extends MybatisBaseService files = new ArrayList<>(); } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/OrgVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/OrgVo.java new file mode 100644 index 0000000000..91a57b8bd6 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/OrgVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.oa.feign.portal.sysstafforg; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/9 + **/ +@Data +public class OrgVo { + + private String useOrgSid; + + private String useOrgName; + + private String deptName; + + private String deptSid; + + private String orgCode; +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/SysStaffOrgFeign.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/SysStaffOrgFeign.java index 4684cc445b..fe8cc0043e 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/SysStaffOrgFeign.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/SysStaffOrgFeign.java @@ -22,4 +22,10 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiOperation("根据用户组织全路径获取用户的分公司sid") ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); + + @GetMapping("/getOrgByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径组织") + public ResultBean getOrgByPath(@RequestParam("orgSidPath") String orgSidPath); + }