费用申请提交修改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -52,7 +52,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserQuery;
+import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
+import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -96,6 +97,8 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffPostFeign sysStaffPostFeign;
+    @Autowired
+    private SysUserRoleFeign sysUserRoleFeign;
 
     public PagerVo<FinCostapplyVo> listPageVo(PagerQuery<FinCostapplyQuery> pq) {
         FinCostapplyQuery query = pq.getParams();
@@ -266,7 +269,7 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         //流程定义id
         bv.setModelId(ProcDefEnum.FINCOSTAPPLY.getProDefId());
         //根据员工sid查询员工的上级岗位
-        ResultBean<String> sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid());
+       /* ResultBean<String> sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid());
         if (!sysPostVoResultBean.getSuccess()) {
             return rb.setMsg(sysPostVoResultBean.getMsg());
         }
@@ -277,6 +280,23 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         userQuery.setOrgSidPath(orgSidPath);
         List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
         sysUserVos.removeAll(Collections.singleton(null));
+        if (sysUserVos.isEmpty()) {
+            return rb.setMsg("下一环节没有用户");
+        }*/
+        //根据员工的sid查询员工的角色
+        String userSid = dto.getCreateBySid();
+        ResultBean<List<String>> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid);
+        UserRoleQuery userRoleQuery = new UserRoleQuery();
+        if(userRoleList.getData().size()>0){
+            userRoleQuery.setRoleSid(userRoleList.getData().get(0));
+        }
+        userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid());
+        ResultBean<List<SysUserVo>> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery);
+        if(!listResultBean.getSuccess()){
+            return rb.setMsg(listResultBean.getMsg());
+        }
+        List<SysUserVo> sysUserVos = listResultBean.getData();
+        sysUserVos.removeAll(Collections.singleton(null));
         if (sysUserVos.isEmpty()) {
             return rb.setMsg("下一环节没有用户");
         }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -968,7 +968,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             return rb.setMsg("角色不能为空");
         }
         if (StringUtils.isBlank(query.getOrgSid())) {
-            return rb.setMsg("机构sid不能为空");
+            return rb.setMsg("部门sid不能为空");
         }
         String upRoleSid = sysRoleService.selectRoleSid(userRoleSid);
         sysUserVoList = baseMapper.getUserByRole(upRoleSid, query.getOrgSid());