oaform修改

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

@@ -230,4 +230,8 @@ public interface SysOrganizationFeign {
     @ApiOperation("当前分公司销售专员")
     ResultBean<List<SysFinanceVo>> selectStaffListByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
 
+    @GetMapping("/getOrgByPath")
+    @ResponseBody
+    @ApiOperation("根据组织全路径查询组织")
+    ResultBean<OrgVo> getOrgByPath(@RequestParam("orgSidPath") String orgSidPath);
 }

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

@@ -236,4 +236,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<List<SysFinanceVo>> selectStaffListByUseOrgSid(String useOrgSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<OrgVo> getOrgByPath(String orgSidPath) {
+        return null;
+    }
 }

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

@@ -127,8 +127,5 @@ public interface SysStaffOrgFeign {
     @ApiOperation("根据组织全路径查询当前部门下的所有员工")
     ResultBean<List<SysStaffOrgByUserVo>> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath);
 
-    @GetMapping("/getOrgByPath")
-    @ResponseBody
-    @ApiOperation("根据组织全路径查询组织")
-    ResultBean<OrgVo> getOrgByPath(@RequestParam("orgSidPath") String orgSidPath);
+
 }

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.portal.api.sysstafforg;
 
+import com.yxt.anrui.portal.api.sysorganization.OrgVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -115,11 +116,6 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign {
 		return null;
 	}
 
-	@Override
-	public ResultBean<OrgVo> getOrgByPath(String orgSidPath) {
-		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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
+import com.yxt.anrui.portal.api.sysorganization.OrgVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
@@ -505,4 +506,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         List<SysFinanceVo> voList = sysOrganizationService.selectStaffListByUseOrgSid(useOrgSid);
         return rb.success().setData(voList);
     }
+
+    @Override
+    public ResultBean<OrgVo> getOrgByPath(String orgSidPath) {
+        return sysOrganizationService.getOrgByPath(orgSidPath);
+    }
 }

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

@@ -717,7 +717,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     }
 
     public List<SysOrganization> selectByOrgCodeAndPsid(String orgCode, String pSid) {
-        return baseMapper.selectByOrgCodeAndPsid(orgCode,pSid);
+        return baseMapper.selectByOrgCodeAndPsid(orgCode, pSid);
     }
 
     public List<SysOrganizationVo> tranOne(String sid) {
@@ -728,8 +728,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return baseMapper.tranTwo(sid);
     }
 
-    public List<SysOrganizationVo> tranThree(String sid,String deptSid) {
-        return baseMapper.tranThree(sid,deptSid);
+    public List<SysOrganizationVo> tranThree(String sid, String deptSid) {
+        return baseMapper.tranThree(sid, deptSid);
     }
 
     public List<SysOrganizationVo> tranfour(String sid) {
@@ -749,4 +749,26 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         return new ArrayList<>();
     }
+
+    public ResultBean<OrgVo> getOrgByPath(String orgSidPath) {
+        ResultBean<OrgVo> rb = ResultBean.fireFail();
+        OrgVo orgVo = new OrgVo();
+        String[] levels = orgSidPath.split("/"); // 将orgSidPath按'/'分割
+        String orgSid = "";
+        // 判断层级
+        if (levels.length > 3) {
+            orgSid = levels[2]; // 第三层级的sid
+        } else {
+            orgSid = levels[levels.length - 2]; // 倒数第二层级的sid
+        }
+        SysOrganization sysOrganization = fetchBySid(orgSid);
+        orgVo.setUseOrgName(sysOrganization.getName());
+        orgVo.setUseOrgSid(sysOrganization.getSid());
+        orgVo.setOrgCode(sysOrganization.getOrgCode());
+        String lastPart = levels[levels.length - 1];
+        sysOrganization = fetchBySid(lastPart);
+        orgVo.setDeptName(sysOrganization.getName());
+        orgVo.setDeptSid(sysOrganization.getSid());
+        return rb.success().setData(orgVo);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.portal.biz.sysstafforg;
 
+import com.yxt.anrui.portal.api.sysorganization.OrgVo;
 import com.yxt.anrui.portal.api.sysstafforg.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -160,8 +161,4 @@ public class SysStaffOrgRest implements SysStaffOrgFeign {
         return sysStaffOrgService.getPathSidByUserSid(applySid);
     }
 
-    @Override
-    public ResultBean<OrgVo> getOrgByPath(String orgSidPath) {
-        return sysStaffOrgService.getOrgByPath(orgSidPath);
-    }
 }

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

@@ -3,6 +3,7 @@ package com.yxt.anrui.portal.biz.sysstafforg;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.sysorganization.OrgVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysstafforg.*;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
@@ -341,25 +342,5 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         return rb.success().setData(sysStaffOrgByUserVoList);
     }
 
-    public ResultBean<OrgVo> getOrgByPath(String orgSidPath) {
-        ResultBean<OrgVo> rb = ResultBean.fireFail();
-        OrgVo orgVo = new OrgVo();
-        String[] levels = orgSidPath.split("/"); // 将orgSidPath按'/'分割
-        String orgSid = "";
-        // 判断层级
-        if (levels.length > 3) {
-            orgSid = levels[2]; // 第三层级的sid
-        } else {
-            orgSid = levels[levels.length - 2]; // 倒数第二层级的sid
-        }
-        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
-        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);
-    }
+
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/SubmitDto.java

@@ -26,8 +26,8 @@ public class SubmitDto {
     private String nextNodeUserSids;
     @ApiModelProperty("下一处理人获取规则")
     private int rule;
-//    @ApiModelProperty("是否是首次提交")
-//    private boolean isNew;
     @ApiModelProperty("任务id")
     private String nextNodeSid;
+    @ApiModelProperty("若含有其他机构的sid，则传")
+    private String orgSid;
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/TaskDto.java

@@ -40,10 +40,10 @@ public class TaskDto {
     /**
      * 终止
      */
-    @ApiModelProperty("流程实例Id(PC)")
-    private String instanceId;
+   /* @ApiModelProperty("流程实例Id(PC)")
+    private String instanceId;*/
 
-    @ApiModelProperty("流程实例Id(移动)")
+    @ApiModelProperty("实例id")
     private String procInsId;
 
     private Map<String, Object> formVariables = new HashMap<>();

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysstafforg/OrgVo.java → yxt-oa/src/main/java/com/yxt/anrui/oa/feign/portal/sysorganization/OrgVo.java

@@ -1,4 +1,4 @@
-package com.yxt.anrui.oa.feign.portal.sysstafforg;
+package com.yxt.anrui.oa.feign.portal.sysorganization;
 
 import lombok.Data;
 

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
@@ -32,4 +33,9 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @GetMapping("/getOrgByPath")
+    @ResponseBody
+    @ApiOperation("根据用户组织全路径组织")
+    public ResultBean<OrgVo> getOrgByPath(@RequestParam("orgSidPath") String orgSidPath);
 }

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

@@ -23,9 +23,4 @@ public interface SysStaffOrgFeign {
     @ApiOperation("根据用户组织全路径获取用户的分公司sid")
     ResultBean<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath);
 
-    @GetMapping("/getOrgByPath")
-    @ResponseBody
-    @ApiOperation("根据用户组织全路径组织")
-    public ResultBean<OrgVo> getOrgByPath(@RequestParam("orgSidPath") String orgSidPath);
-
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/sysuser/SysUserFeign.java

@@ -5,11 +5,14 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 @Api(tags = "用户表")
 @FeignClient(
         contextId = "anrui-portal-SysUser",
@@ -24,4 +27,13 @@ public interface SysUserFeign {
     @ApiOperation("根据sid获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysUserVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation(value = "获取其他机构链角色的用户")
+    @GetMapping(value = "getOtherOrgRoleUser")
+    ResultBean<List<SysUserVo>> getOtherOrgRoleUser(@SpringQueryMap UserRoleQuery query);
+
+    @ApiOperation(value = "获取本机构链角色的用户")
+    @GetMapping(value = "getUserByRole")
+    ResultBean<List<SysUserVo>> getUserByRole(@SpringQueryMap UserQuery query);
+
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/sysuser/UserQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.oa.feign.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/21 8:47
+ * @Description
+ */
+@Data
+public class UserQuery implements Query {
+
+    private static final long serialVersionUID = -3979717077029562761L;
+    @ApiModelProperty(value = "角色sid必传项")
+    private String roleSid;
+    @ApiModelProperty(value = "用户部门sid路径是必传项")
+    private String orgSidPath;
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/sysuser/UserRoleQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.oa.feign.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/25 8:38
+ * @Description
+ */
+@Data
+public class UserRoleQuery implements Query {
+    private static final long serialVersionUID = 1913450300189800653L;
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    private String orgSid;
+}