diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index b43ebcc4e7..a7b3e65ac3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java @@ -245,5 +245,4 @@ public interface BaseManufacturerFeign { @GetMapping("/getBankList") @ResponseBody ResultBean> getBankList(@RequestParam("sid")String sid); - } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java index e343136bce..f5e0a7f5c2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java @@ -34,4 +34,7 @@ public class BaseChoiceVehicleQuery implements Query { @ApiModelProperty(value = "调入分公司sid") private String buyerOrgSid; + + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index d9c5cacf2b..f1155799bc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -40,6 +40,7 @@ import java.util.Map; path = "v1/basevehicle", fallback = BaseVehicleFeignFallback.class) public interface BaseVehicleFeign { + scm/v1/scmwarehouse/fetchByUseOrgSid /** * 分页列表 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java index d1b87aa205..eca9b3d9c9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java @@ -16,6 +16,7 @@ public class VinByWarehouseQuery implements Query { @ApiModelProperty("用户sid") private String userSid; + //后台自己查询，然后赋值的 @ApiModelProperty("分公司sid") private String useOrgSid; @@ -24,4 +25,7 @@ public class VinByWarehouseQuery implements Query { @ApiModelProperty("已选择车架号") private List vins; + + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java index acce4d0621..6c58ce66f6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java @@ -50,4 +50,7 @@ public class BaseVehicleActualSalesDetailsVo implements Vo { private String carBrandSid; @ApiModelProperty(value = "品牌名称") private String carBrandName; + + @ApiModelProperty("申请人的组织机构全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java index a2bb9bb24d..4942880bd0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java @@ -54,6 +54,8 @@ public class BaseVehicleActualSalesDto implements Dto { private String carBrandSid; @ApiModelProperty(value = "品牌名称") private String carBrandName; - + @ApiModelProperty("后台自己赋值") private String orgSidPath; + @ApiModelProperty("前端传") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesQuery.java index 233e6601fc..067a056c4c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesQuery.java @@ -23,4 +23,7 @@ public class BaseVehicleActualSalesQuery implements Query { @ApiModelProperty(value = "用户sid") private String userSid; + + @ApiModelProperty("当前组织机构的全路径sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java index e73fd0765b..62db10bb30 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderQuery.java @@ -77,4 +77,7 @@ public class BusVehicleOrderQuery implements Query { @ApiModelProperty("排产申请编号") private String applicationCode; + + @ApiModelProperty("当前组织机构sid") + private String orgPath; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index aef7ee7a73..7f4d08df60 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -217,6 +217,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService dtoList = new ArrayList<>(); - //根据申请人查询分公司sid - ResultBean stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApplyDetailsVo.getCreateBySid()); List busVehicleApplyDetailVoList = busVehicleApplyDetailsVo.getBusVehicleApplyDetailList(); busVehicleApplyDetailVoList.removeAll(Collections.singleton(null)); for (BusVehicleApplyDetailVo vo : busVehicleApplyDetailVoList) { BusVehicleOrderListDto listDto = new BusVehicleOrderListDto(); listDto.setPurchaseRequisitionSid(vo.getApplySid()); listDto.setPurchaseApplyMediumModelSid(vo.getSid()); - listDto.setCreateOrgSid(stringResultBean.getData()); - listDto.setUseOrgSid(stringResultBean.getData()); + listDto.setCreateOrgSid(busVehicleApplyDetailsVo.getCreateOrgSid()); + listDto.setUseOrgSid(busVehicleApplyDetailsVo.getCreateOrgSid()); listDto.setPlatformNo(vo.getQuantity()); listDto.setOrderType(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks()); listDto.setOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode()); @@ -267,8 +268,6 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApplyDetailsVo.getCreateBySid()); List busVehicleApplyDetailVoList = busVehicleApplyDetailsVo.getBusVehicleApplyDetailList(); busVehicleApplyDetailVoList.removeAll(Collections.singleton(null)); for (BusVehicleApplyDetailVo vo : busVehicleApplyDetailVoList) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java index 5a638b6523..2e11c2a370 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java @@ -75,7 +75,7 @@ public class BaseMiddlemanService extends MybatisBaseService qw = new QueryWrapper<>(); if (params != null) { String orgPath = ""; - if (com.yxt.common.base.utils.StringUtils.isBlank(params.getOrgPath())) { + if (StringUtils.isBlank(params.getOrgPath())) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); qw.eq("bm.useOrgSid", orgPath); } else { @@ -94,19 +94,19 @@ public class BaseMiddlemanService extends MybatisBaseService vehicleActualWrapper(BaseChoiceVehicleQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { - //本分公司 - if (StringUtils.isNotBlank(params.getUserSid())) { - String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + if(StringUtils.isNotBlank(params.getOrgPath())){ + String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); qw.eq("bv.createOrgSid", orgSid); + }else{ + //本分公司 + if (StringUtils.isNotBlank(params.getUserSid())) { + String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + qw.eq("bv.createOrgSid", orgSid); + } } //品牌 if (StringUtils.isNotBlank(params.getBrandSid())) { @@ -2251,8 +2256,13 @@ public class BaseVehicleService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = new QueryWrapper(); VinByWarehouseQuery params = pagerQuery.getParams(); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); - params.setUseOrgSid(useOrgSid); + if(StringUtils.isNotBlank(params.getOrgPath())){ + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); + params.setUseOrgSid(useOrgSid); + }else{ + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + params.setUseOrgSid(useOrgSid); + } if (StringUtils.isNotBlank(params.getVin())) { qw.like("bv.vinNo", params.getVin()); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml index 5c0dd4ffaf..3e8684a5ba 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml @@ -28,7 +28,8 @@ useOrgSid, useOrgName, carBrandSid, - carBrandName + carBrandName, + orgSidPath as orgPath from base_vehicle_actual_sales where sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 71069a7994..e6d9526d20 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -133,6 +133,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid()); if (!userVoResultBean.getSuccess()) { @@ -312,8 +322,26 @@ public class BaseVehicleActualSalesService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } if (dto.getDetailsList().size() == 0) { return rb.setMsg("请选择未售买断的车辆"); } else { @@ -339,19 +367,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); BaseVehicleActualSales baseVehicleActualSales = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, baseVehicleActualSales); if (r == 3) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 58631d809c..fbe12100b7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -162,7 +162,8 @@ public class BusVehicleApplyService extends MybatisBaseService stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApply.getCreateBySid()); - baseManufactorSubscriptionDto.setCreateOrgSid(stringResultBean.getData()); - baseManufactorSubscriptionDto.setUseOrgSid(stringResultBean.getData()); + baseManufactorSubscriptionDto.setCreateOrgSid(busVehicleApply.getCreateOrgSid()); + baseManufactorSubscriptionDto.setUseOrgSid(busVehicleApply.getCreateOrgSid()); baseManufactorSubscriptionDto.setPaymentMoney(busVehicleApply.getCurrentAmount().toString());//打款金额 baseManufactorSubscriptionDto.setProSchAppNo(busVehicleApply.getApplicationCode());//排产申请编号 baseManufactorSubscriptionDto.setApplyType(busVehicleApply.getApplyType()); @@ -587,8 +587,8 @@ public class BusVehicleApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { BusVehicleOrderQuery query = pq.getParams(); - String staffSid = query.getStaffSid(); + if(StringUtils.isNotBlank(query.getOrgPath())){ + String orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + query.setUseOrgSid(orgSid); + }else{ + String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); + query.setUseOrgSid(orgSid); + } + /* String staffSid = query.getStaffSid(); ResultBean> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); List data = sysStaffOrgListByStaffSid.getData(); String orgSidPath = ""; @@ -166,7 +171,7 @@ public class BusVehicleOrderService extends MybatisBaseService qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -190,7 +195,7 @@ public class BusVehicleOrderService extends MybatisBaseService listPageVo(PagerQuery pq) { FinCollectionConfirmationQuery query = pq.getParams(); - /* String staffSid = query.getCreateBySid(); - ResultBean> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); - List data = sysStaffOrgListByStaffSid.getData(); - String orgSidPath = ""; - for (SysStaffOrgVo datum : data) { - orgSidPath = datum.getOrgSidPath(); - String[] split = orgSidPath.split("/"); - for (String s : split) { - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s); - SysOrganizationVo data1 = sysOrganizationVoResultBean.getData(); - Integer isDept = data1.getIsDept(); - String psid = data1.getPsid(); - if (isDept == 0 && !psid.equals(0)) { - orgSidPath = s; - break; - } - } - }*/ - //根据用户sid查询分公司sid - String createBySid = query.getCreateBySid(); - String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData(); - query.setUseOrgSid(userOrgSid); + if(StringUtils.isNotBlank(query.getOrgPath())){ + String userOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + query.setUseOrgSid(userOrgSid); + }else{ + //根据用户sid查询分公司sid + String createBySid = query.getCreateBySid(); + String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData(); + query.setUseOrgSid(userOrgSid); + } QueryWrapper qw = createQueryWrapper(query); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -282,22 +269,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); - /*if (paymentVoucherAppendixs.size() == 0) { - return rb.setMsg("请上传打款凭证附件"); - }*/ List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); - /*if (remittanceConfirmationAppendixs.size() == 0) { - return rb.setMsg("请上传汇款确认书附件"); - }*/ if (finSelectedReceivablesDetailedDtos.size() > 0) { for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) { if (StringUtils.isBlank(v.getSubscriptionMoney())) { return rb.setMsg("认款金额不允许为空"); } - /* if (StringUtils.isBlank(v.getSubscriptionDate())) { - return rb.setMsg("认款申请日期不能为空"); - }*/ - } } @@ -306,7 +283,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { //认款明细保存 String finalSid = sid; + String finalUseOrgSid = useOrgSid; finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid"); finSelectedReceivablesDetailed.setCollSid(finalSid); - finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid); + finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid); //设置审核状态为待审核(1待审核/2已驳回/3已审核) finSelectedReceivablesDetailed.setAuditState(1); finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid()); @@ -401,9 +385,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 7e2c01dae7..e25bc992e6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -155,6 +155,10 @@ public class FinPaymentapplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); @@ -276,18 +285,24 @@ public class FinPaymentapplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); + String orgSidPath = ""; + if(StringUtils.isNotBlank(dto.getOrgPath())){ + orgSidPath = dto.getOrgSidPath(); + + }else{ + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); } - //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + FinPaymentapply finPaymentapply = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, finPaymentapply); if (r == 3) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index c85a8e86b4..2939229a44 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -141,11 +141,17 @@ public class FinPaymentrecordService extends MybatisBaseService= date_format('" + pageQuery.getCreateStartDate() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(pageQuery.getCreateEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getCreateEndDate() + "','%Y-%m-%d')" ); - //分公司sid - if (StringUtils.isNotBlank(pageQuery.getUserSid())) { - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(pageQuery.getUserSid()); - qw.eq("fp.useOrgSid", resultBean.getData()); + if(StringUtils.isNotBlank(pageQuery.getOrgPath())){ + String orgSid = sysStaffOrgFeign.getOrgSidByPath(pageQuery.getOrgPath()).getData(); + qw.eq("fp.useOrgSid", orgSid); + }else{ + //分公司sid + if (StringUtils.isNotBlank(pageQuery.getUserSid())) { + ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(pageQuery.getUserSid()); + qw.eq("fp.useOrgSid", resultBean.getData()); + } } + } qw.orderByDesc("fp.createTime"); IPage page = PagerUtil.queryToPage(pq); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 7dd7db6ff1..0c87473394 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -149,30 +149,13 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } public List listAllVo(FinUncollectedReceivablesDetailedQuery query) { - /*String staffSid = query.getCreateBySid(); - ResultBean> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); - List data = sysStaffOrgListByStaffSid.getData(); - String orgSidPath = ""; - for (SysStaffOrgVo datum : data) { - orgSidPath = datum.getOrgSidPath(); - String[] split = orgSidPath.split("/"); - for (String s : split) { - ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s); - SysOrganizationVo data1 = sysOrganizationVoResultBean.getData(); - Integer isDept = data1.getIsDept(); - String psid = data1.getPsid(); - if (isDept == 0 && !psid.equals(0)) { - orgSidPath = s; - break; - } - } - }*/ - String createBySid = query.getCreateBySid(); -// String createBySid = "221788c5-d122-484f-acfb-11e1842b39f0"; -// query.setCreateBySid(createBySid); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData(); - query.setUseOrgSid(useOrgSid); - + if(StringUtils.isNotBlank(query.getOrgPath())){ + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + query.setUseOrgSid(useOrgSid); + }else{ + String createBySid = query.getCreateBySid(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData(); + } QueryWrapper qw = createQueryWrapper(query); List list = baseMapper.selectListAllVo(qw); list.removeAll(Collections.singleton(null)); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java index a78a4748e6..305aa83e9d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeign.java @@ -37,7 +37,7 @@ public interface AppIndexFeign { @ApiOperation(value = "移动端各插件的应用") @ResponseBody @GetMapping("/getBusinessList") - ResultBean> getBusinessList(@RequestParam("userSid") String userSid, @RequestParam("appSid") String appSid); + ResultBean> getBusinessList(@RequestParam("userSid") String userSid, @RequestParam("appSid") String appSid,@RequestParam("orgPath")String orgPath); @ApiOperation(value = "移动端各插件的应用数量") @ResponseBody diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java index 4c4b0abb3e..ebf5f02c90 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexFeignFallBack.java @@ -29,7 +29,7 @@ public class AppIndexFeignFallBack implements AppIndexFeign { } @Override - public ResultBean> getBusinessList(String userSid, String appSid) { + public ResultBean> getBusinessList(String userSid, String appSid,String orgPath) { return null; } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java index 077da6ab75..05482e8baa 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/index/AppIndexNewVo.java @@ -19,4 +19,6 @@ public class AppIndexNewVo implements Vo { private List apps; + + } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index f07876c1ea..4b396a1dd3 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -132,8 +132,13 @@ public interface SysStaffinfoFeign { @PostMapping("/getUserList") ResultBean> getUserList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("移动端-存放地点变更-获取人员列表") + @ApiOperation("存放地点变更-获取人员列表") @ResponseBody @GetMapping("/getGressionUserList/{userSid}") ResultBean> getGressionUserList(@PathVariable("userSid") String userSid); + + @ApiOperation("切换机构：存放地点变更-获取人员列表") + @ResponseBody + @GetMapping("/getGressionUserList") + ResultBean> getGressionUserList(@RequestParam("userSid")String userSid,@RequestParam("orgPath")String orgPath); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 28d4cce35d..f4727b99a7 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -93,4 +93,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return null; } + @Override + public ResultBean> getGressionUserList(String userSid, String orgPath) { + return null; + } + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java index 7d4e7c0294..a09802d77a 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -247,4 +247,6 @@ public interface SysUserFeign { @ApiOperation(value = "根据用户sid获取当前用户所有的组织机构list") @GetMapping(value = "/getOrgListByUserSid") ResultBean> getOrgListByUserSid(@RequestParam("userSid") String userSid); + + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java index 17388674b0..fef8f55d92 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java @@ -83,4 +83,8 @@ public interface AppSysUserFeign { @ResponseBody @PutMapping("/updateAppId") ResultBean updateAppId(@RequestParam(value = "mobile", required = false) String mobile); + + @ApiOperation(value = "移动端：查询该菜单是否允许创建，是否有提醒消息") + @GetMapping(value = "/selectAppHaveMessage") + ResultBean selectAppHaveMessage(@RequestParam("menuSid")String menuSid,@RequestParam("orgPath")String orgPath); } diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java index d42c22448c..0405c60d83 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java @@ -65,4 +65,9 @@ public class AppSysUserFeignFallback implements AppSysUserFeign { public ResultBean updateAppId(String mobile) { return null; } + + @Override + public ResultBean selectAppHaveMessage(String menuSid, String orgPath) { + return null; + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java index 31e1de314f..d37297cba7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java @@ -185,8 +185,8 @@ public class AppIndexRest implements AppIndexFeign { } @Override - public ResultBean> getBusinessList(String userSid, String appSid) { - return appIndexService.getBusinessList(userSid, appSid); + public ResultBean> getBusinessList(String userSid, String appSid,String orgPath) { + return appIndexService.getBusinessList(userSid, appSid,orgPath); } @Override diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java index 9a72ada840..95c4d7827b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java @@ -1,5 +1,8 @@ package com.yxt.anrui.portal.biz.index; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.yxt.anrui.portal.api.index.AppIndexNewListVo; import com.yxt.anrui.portal.api.index.AppIndexNewVo; import com.yxt.anrui.portal.api.index.AppIndexNumQuery; import com.yxt.anrui.portal.api.index.AppIndexNumVo; @@ -7,6 +10,7 @@ import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu; import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo; import com.yxt.anrui.portal.biz.sysmobilemenu.SysMobileMenuService; import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService; +import com.yxt.anrui.portal.biz.sysuser.SysUserService; import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.ScmVehicleEnterlibraryFeign; import com.yxt.anrui.scm.api.scmvehicleexamine.AppToDoNumQuery; @@ -20,7 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -46,8 +52,10 @@ public class AppIndexService { private ScmVehicleInventoryFeign scmVehicleInventoryFeign; @Autowired private ScmVehiclePatrolinspectionFeign scmVehiclePatrolinspectionFeign; + @Autowired + private SysUserService sysUserService; - public ResultBean> getBusinessList(String userSid, String appSid) { + public ResultBean> getBusinessList(String userSid, String appSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); if (StringUtils.isBlank(userSid) || StringUtils.isBlank(appSid)) { return rb.setData(new ArrayList<>()); @@ -57,6 +65,39 @@ public class AppIndexService { List roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList()); //根据appSid和角色sid查询移动端菜单 List appIndexNewVos = getApp(roleSids, appSid); + for (AppIndexNewVo vo : appIndexNewVos) { + List apps = vo.getApps(); + if(apps != null && apps.size()>0){ + for (AppIndexNewListVo vv : apps) { + if ("移库".equals(vv.getName()) || "简易订单".equals(vv.getName()) || "销售订单".equals(vv.getName())) { + ResultBean resultBean = sysUserService.selectAppHaveMessage(vv.getSid(), orgPath); + String json = vv.getJson(); + if (StringUtils.isNotBlank(json)) { + //将字符串json转为map + Map map = JSON.parseObject(json); + if (resultBean.getSuccess()) { + map.put("banCreate", false); + } else { + map.put("reason", resultBean.getMsg()); + map.put("banCreate", true); + } + vv.setJson(JSONObject.toJSONString(map)); + } else { + Map map = new HashMap<>(); + if (resultBean.getSuccess()) { + map.put("banCreate", false); + } else { + map.put("reason", resultBean.getMsg()); + map.put("banCreate", true); + } + vv.setJson(JSONObject.toJSONString(map)); + } + } + } + } + + + } return rb.success().setData(appIndexNewVos); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java index 273370c0bd..e8a3db9f68 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java @@ -62,4 +62,6 @@ public interface SysRoleMapper extends BaseMapper { List selectByUser(String userSid); List selectRoleList(String menuSid); + + List selectMobileRoleList(String menuSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml index 80d0c8dc26..e6fae65012 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml @@ -92,7 +92,16 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java index 1fc5b4f02f..168a8e64a7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java @@ -167,4 +167,8 @@ public class SysRoleService extends MybatisBaseService { public List selectRoleList(String menuSid) { return baseMapper.selectRoleList(menuSid); } + + public List selectMobileRoleList(String menuSid) { + return baseMapper.selectMobileRoleList(menuSid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index 33e4b0fff5..b7f07f756b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -203,7 +203,12 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { @Override public ResultBean> getGressionUserList(String userSid) { - return sysStaffinfoService.getGressionUserList(userSid); + return sysStaffinfoService.getGressionUserList(userSid,""); + } + + @Override + public ResultBean> getGressionUserList(String userSid, String orgPath) { + return sysStaffinfoService.getGressionUserList(userSid,orgPath); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 43d2cee07c..8cad7d8f4e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -736,10 +736,15 @@ public class SysStaffinfoService extends MybatisBaseService> getGressionUserList(String userSid) { + public ResultBean> getGressionUserList(String userSid,String orgPath) { ResultBean> rb = ResultBean.fireFail(); - String userOrgSid = sysStaffOrgService.getPathSidByUserSid(userSid).getData(); - List list = baseMapper.getGressionUserList(userOrgSid); + String useOrgSid = ""; + if(StringUtils.isNotBlank(orgPath)){ + useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData(); + }else{ + useOrgSid = sysStaffOrgService.getPathSidByUserSid(userSid).getData(); + } + List list = baseMapper.getGressionUserList(useOrgSid); return rb.success().setData(list); } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index 2748e99037..1c0758fd5b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -8,6 +8,7 @@ import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.portal.api.sms.SmsFeign; import com.yxt.anrui.portal.api.sysmenu.SysMenu; +import com.yxt.anrui.portal.api.sysmobilemenu.SysMobileMenu; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; @@ -22,6 +23,7 @@ import com.yxt.anrui.portal.api.sysuser.wx.WxMySysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.wx.WxSysUserVo; import com.yxt.anrui.portal.api.sysuserdefaultorg.SysUserDefaultOrg; import com.yxt.anrui.portal.biz.sysmenu.SysMenuService; +import com.yxt.anrui.portal.biz.sysmobilemenu.SysMobileMenuService; import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService; import com.yxt.anrui.portal.biz.sysrole.SysRoleService; import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; @@ -109,6 +111,8 @@ public class SysUserService extends MybatisBaseService { private SysUserDefaultOrgService sysUserDefaultOrgService; @Autowired private SysMenuService sysMenuService; + @Autowired + private SysMobileMenuService sysMobileMenuService; public PagerVo listPage(PagerQuery pq) { @@ -135,7 +139,7 @@ public class SysUserService extends MybatisBaseService { if (StringUtils.isNotBlank(query.getName())) { qw.like("staff.name", query.getName()); } - qw.ne("staff.personTypeKey","01"); + qw.ne("staff.personTypeKey", "01"); return qw; } @@ -380,14 +384,14 @@ public class SysUserService extends MybatisBaseService { //根据orgSidPath查询分公司sid===== //根据用户sid查询用户是否设置了默认的组织机构 SysUserDefaultOrg sysUserDefaultOrg = sysUserDefaultOrgService.selectByUserSid(user.getSid()); - if(sysUserDefaultOrg == null){ + if (sysUserDefaultOrg == null) { userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath()); userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath()); - }else{ + } else { List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid()); sysStaffOrgVos.removeAll(Collections.singleton(null)); - List orgSidPathList = sysStaffOrgVos.stream().map(v->v.getOrgSidPath()).collect(Collectors.toList()); - if(!orgSidPathList.contains(sysUserDefaultOrg.getOrgSidPath())){ + List orgSidPathList = sysStaffOrgVos.stream().map(v -> v.getOrgSidPath()).collect(Collectors.toList()); + if (!orgSidPathList.contains(sysUserDefaultOrg.getOrgSidPath())) { sysUserDefaultOrgService.deleteByUserSid(user.getSid()); } userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath()); @@ -947,7 +951,7 @@ public class SysUserService extends MybatisBaseService { public ResultBean reGetPwd(String userName, String userPhone) { ResultBean rb = ResultBean.fireFail(); String userSid = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone); - if (StringUtils.isNotBlank(userSid)){ + if (StringUtils.isNotBlank(userSid)) { Boolean aBoolean = initPwd(userSid); if (!aBoolean) { return ResultBean.fireFail().setMsg("初始化密码失败"); @@ -1006,11 +1010,11 @@ public class SysUserService extends MybatisBaseService { if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) { String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1]; sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid); - if(sysUserVoList.size()>1){ - List stringList = sysUserVoList.stream().map(v->v.getSid()).collect(Collectors.toList()); - List sysUserVoList1 = baseMapper.getUserMessageByRole(query.getRoleSid(), levelOrgSid,stringList); + if (sysUserVoList.size() > 1) { + List stringList = sysUserVoList.stream().map(v -> v.getSid()).collect(Collectors.toList()); + List sysUserVoList1 = baseMapper.getUserMessageByRole(query.getRoleSid(), levelOrgSid, stringList); sysUserVoList1.removeAll(Collections.singleton(null)); - if(sysUserVoList1.size()>0){ + if (sysUserVoList1.size() > 0) { sysUserVoList = sysUserVoList1; } } @@ -1104,14 +1108,14 @@ public class SysUserService extends MybatisBaseService { return rb.success().setData(sysUserVoList); } - public ResultBean> selectSysUserList(String userSid,String orgPath) { + public ResultBean> selectSysUserList(String userSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); //销售经理角色sid String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f"; UserQuery userRoleQuery = new UserQuery(); - if(StringUtils.isNotBlank(orgPath)){ + if (StringUtils.isNotBlank(orgPath)) { userRoleQuery.setOrgSidPath(orgPath); - }else{ + } else { //根据用户sid查询用户的部门全路径 SysUserVo vo = fetchBySidVo(userSid); //根据staffSid获取用户的组织全路径 @@ -1166,32 +1170,32 @@ public class SysUserService extends MybatisBaseService { String orgPath = sysHaveMessageQuery.getOrgPath(); //根据orgPath 查询当前组织所管理的层级 List orgPathsList = Arrays.asList(orgPath.split("/")); - String orgSid = orgPathsList.get(orgPathsList.size()-1); + String orgSid = orgPathsList.get(orgPathsList.size() - 1); SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); - if(sysOrganization == null){ + if (sysOrganization == null) { return rb.setMsg("当前所在组织机构不存在"); } //根据菜单路由查询菜单的sid List sysMenuList = sysMenuService.selectByMenuUrl(menuUrl); - if(sysMenuList.size()>1){ + if (sysMenuList.size() > 1) { return rb.setMsg("当前菜单的路由存在多个，请联系管理员"); - }else if(sysMenuList.size() == 0){ + } else if (sysMenuList.size() == 0) { return rb.setMsg("当前菜单不存在"); - }else{ + } else { String menuSid = sysMenuList.get(0).getSid(); //根据菜单sid查询所授权的角色 List list = sysRoleService.selectRoleList(menuSid); list.removeAll(Collections.singleton(null)); - if(!list.isEmpty()){ - List typeList = list.stream().map(v->v.getRoleType()).collect(Collectors.toList()); - if(StringUtils.isBlank(sysOrganization.getOrgLevelKey())){ + if (!list.isEmpty()) { + List typeList = list.stream().map(v -> v.getRoleType()).collect(Collectors.toList()); + if (StringUtils.isBlank(sysOrganization.getOrgLevelKey())) { return rb.setMsg("当前组织未设置管理层级"); } - if(!typeList.contains(sysOrganization.getOrgLevelKey())){ + if (!typeList.contains(sysOrganization.getOrgLevelKey())) { return rb.setMsg("请检查当前菜单是否为目前机构层级对应的角色"); } - }else{ + } else { return rb.setMsg("当前菜单未授权角色权限"); } } @@ -1213,4 +1217,35 @@ public class SysUserService extends MybatisBaseService { } return rb.success().setData(orgList); } + + public ResultBean selectAppHaveMessage(String menuSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + //根据orgPath 查询当前组织所管理的层级 + List orgPathsList = Arrays.asList(orgPath.split("/")); + String orgSid = orgPathsList.get(orgPathsList.size() - 1); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if (sysOrganization == null) { + return rb.setMsg("当前所在组织机构不存在"); + } + SysMobileMenu sysMobileMenu = sysMobileMenuService.fetchBySid(menuSid); + if (sysMobileMenu == null) { + return rb.setMsg("当前菜单不存在"); + } + //根据菜单sid查询所授权的角色 + List list = sysRoleService.selectMobileRoleList(menuSid); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + List typeList = list.stream().map(v -> v.getRoleType()).collect(Collectors.toList()); + if (StringUtils.isBlank(sysOrganization.getOrgLevelKey())) { + return rb.setMsg("当前组织未设置管理层级"); + } + if (!typeList.contains(sysOrganization.getOrgLevelKey())) { + return rb.setMsg("请检查当前菜单是否为目前机构层级对应的角色"); + } + + } else { + return rb.setMsg("当前菜单未授权角色权限"); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java index c99cfcbb72..08a6bcf76c 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java @@ -432,6 +432,11 @@ public class AppSysUserRest implements AppSysUserFeign { return sysUserService.updateAppIdByMobile(mobile); } + @Override + public ResultBean selectAppHaveMessage(String menuSid, String orgPath) { + return sysUserService.selectAppHaveMessage(menuSid,orgPath); + } + // 解绑设备关联的账号 // 解绑账号绑定的设备 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryPageQuery.java index 2efe27bd5a..7b1110258d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleenterlibrary/ScmVehicleEnterlibraryPageQuery.java @@ -27,8 +27,10 @@ public class ScmVehicleEnterlibraryPageQuery implements Query { @ApiModelProperty("结束入库时间") private String inboundEndDate; - + //后台自己赋值 @ApiModelProperty("使用组织分公司sid") private String useOrgSid; + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java index 6cf4384cbb..ebb430bf9f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java @@ -69,7 +69,10 @@ public class ScmVehicleExaminePageQuery implements Query { @ApiModelProperty("订单类型（外采，内购，排产）") private String purchaseType; + //后端自己赋值的 @ApiModelProperty("使用组织分公司sid") private String useOrgSid; + @ApiModelProperty("当前组织机构全路径sid") + private String orgPath; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java index b004364cd3..45ea8d55a7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java @@ -31,4 +31,6 @@ public class ScmVehicleGressionPageQuery implements Query { private String targetLocationSid; @ApiModelProperty("经办人") private String operator; + + private String orgPath; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index e53a0380df..657168e446 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -186,8 +186,14 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService selectCarWarehousingList(PagerQuery pq) { IPage page = PagerUtil.queryToPage(pq); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); - pq.getParams().setUseOrgSid(useOrgSid); + ScmVehicleEnterlibraryPageQuery params = pq.getParams(); + if(StringUtils.isNotBlank(params.getOrgPath())){ + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(pq.getParams().getUserSid()).getData(); + params.setUseOrgSid(useOrgSid); + }else{ + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); + params.setUseOrgSid(useOrgSid); + } QueryWrapper qw = pcQueryWrapper(pq.getParams()); IPage iPage = baseMapper.selectCarWarehousingList(page, qw); List records = iPage.getRecords(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 34f45eda9e..80b313ab23 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -191,8 +191,15 @@ public class ScmVehicleExamineService extends MybatisBaseService selectCarInspectedList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid); + ScmVehicleExaminePageQuery params = pagerQuery.getParams(); + if(StringUtils.isNotBlank(params.getOrgPath())){ + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); + params.setUseOrgSid(useOrgSid); + + }else{ + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + params.setUseOrgSid(useOrgSid); + } QueryWrapper qw = carInspectedQueryWrapper(pagerQuery.getParams()); IPage iPage = baseMapper.selectCarInspectedList(page, qw); List records = iPage.getRecords(); @@ -625,20 +632,20 @@ public class ScmVehicleExamineService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgPath); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid); if (sysOrganizationVoResultBean.getSuccess()) { SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData(); orgName = sysOrganizationVo.getName(); } String vinNo = dto.getVin(); - int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgPath); + int countByVinNo = baseMapper.getCountByVinNo(vinNo, orgSid); if (countByVinNo > 0) { return rb.setMsg("该车架号已存在，请勿重复验车！"); } @@ -693,7 +700,7 @@ public class ScmVehicleExamineService extends MybatisBaseService list = new ArrayList(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index f644464018..747a9b9568 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -284,6 +284,10 @@ public class ScmVehicleGressionService extends MybatisBaseService= date_format('" + inventStartDate + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')" ); + if(StringUtils.isNotBlank(query.getOrgPath())){ + String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + qw.eq("svg.useorgSid",orgpath); + } return qw; } @@ -398,16 +402,18 @@ public class ScmVehicleGressionService extends MybatisBaseService