问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -301,6 +301,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             qw.notIn("bipv.sid", query.getSids());
         }
         qw.eq("bip.nodeState", "已办结");
+        qw.ne("bv.vehicleState", "0004");
         qw.ne("bipv.recallStateKey", VehicleState.RecallState.RECALL.getCode());
         qw.ne("bipv.recallStateKey", VehicleState.RecallState.DCZ_RECALL.getCode());
         IPage<BaseInternalPurchaseVehicleDetailsVo> page = PagerUtil.queryToPage(pq);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -66,6 +66,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 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.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
 import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
@@ -624,33 +625,28 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 }
                 baseInternalPurchaseVehicleService.updateGuidedPriceBySid(sid, guidedPrice);
             }
-            String callInOrgSid = baseInternalPurchase.getBuyerOrgSid();
             ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
             //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
             List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
             List<String> candidateGroups = voList.get(0).getCandidateGroups();
-            UserRoleQuery userRoleQuery = new UserRoleQuery();
+            UserQuery userQuery = new UserQuery();
-            if (StringUtils.isNotBlank(id)) {
+            //调入采购部门sid
-                if (id.equals("Activity_08r04ow")) {//事业部副总经理审批(管辖调出方)
+            String callInBuyerOrgSid = baseInternalPurchase.getCallInBuyerOrgSid();
-                    String sellerOrgSid = baseInternalPurchase.getSellerOrgSid();
+            //调入部门信息
-                    userRoleQuery.setRoleSid(candidateGroups.get(0));
+            SysOrganizationVo sysOrganizationVoDRBM = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
-                    userRoleQuery.setOrgSid(sellerOrgSid);
+            //调入部门全路径
-                    SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInOrgSid).getData();
+            String orgSidPathDRBM = sysOrganizationVoDRBM.getOrgSidPath();
-                    String orgSidPath = data.getOrgSidPath();
+            userQuery.setRoleSid(candidateGroups.get(0));
-                    bv.setOrgSidPath(orgSidPath);
+            if (id.equals("Activity_08r04ow")) {//判断下一环节是否为事业部副总经理审批(管辖调出方)
-                } else if (id.equals("Activity_02xqz9n")) {//事业部副总经理审批(管辖调入方)
+                userQuery.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
-                    String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
+            }
-                    userRoleQuery.setRoleSid(candidateGroups.get(0));
+            //else if (id.equals("Activity_02xqz9n")) {//判断下一环节是否为事业部副总经理审批(管辖调入方)
-                    userRoleQuery.setOrgSid(buyerOrgSid);
+            //    userQuery.setOrgSidPath(orgSidPathDRBM);
-                } else {
+            // }
-                    userRoleQuery.setRoleSid(candidateGroups.get(0));
+            else {
-                    userRoleQuery.setOrgSid(callInOrgSid);
+                userQuery.setOrgSidPath(orgSidPathDRBM);
-                }
+            }
-            } else {
+            List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
-                userRoleQuery.setRoleSid(candidateGroups.get(0));
-                userRoleQuery.setOrgSid(callInOrgSid);
-            }
-            List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
             StringBuilder nextNodeUserSids = new StringBuilder();
             if (sysUserVos.size() > 0) {
                 for (SysUserVo sysUserVo : sysUserVos) {