From 3fbbeab73cc6642e18a78a41acf02ac2e8093d62 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 3 Feb 2023 10:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/sysstaffinfo/SysStaffinfoRest.java | 19 +++++++++++++++---- .../portal/biz/sysuser/SysUserService.java | 5 +++++ .../saleOrders/AppBusSalesOrderFeign.java | 2 +- .../saleOrders/order/FlowOrderVo.java | 5 ++--- .../saleOrders/AppBusSalesOrderService.java | 5 +++++ 5 files changed, 28 insertions(+), 8 deletions(-) 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 b7f07f756b..aade5054c6 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysstaffinfo.*; import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery; import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.biz.sysuser.SysUserService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.PagerUtil; @@ -167,12 +168,22 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { if (StringUtils.isNotBlank(appContactsDetailsVo.getHeadImage())) { appContactsDetailsVo.setHeadImage(fileUploadComponent.getUrlPrefix() + appContactsDetailsVo.getHeadImage()); } + SysUserVo sysUser = sysUserService.selectByStaffsid(staffSid); //根据用户sid查询岗位 - List stringList = sysUserService.getPost(staffSid); - stringList.removeAll(Collections.singleton(null)); - if (!stringList.isEmpty()) { - appContactsDetailsVo.setPosition(String.join("|", stringList)); + String isAdmin = ""; + if(sysUser != null){ + isAdmin = sysUser.getIsAdmin(); } + if("1".equals(isAdmin)){ + + }else{ + List stringList = sysUserService.getPost(staffSid); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + appContactsDetailsVo.setPosition(String.join("|", stringList)); + } + } + return new ResultBean().success().setData(appContactsDetailsVo); } 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 1c0758fd5b..0694c64260 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 @@ -325,6 +325,8 @@ public class SysUserService extends MybatisBaseService { //公共的方法 public SysUserVo selectUserOne(SysUser user) { // 根据用户信息查询用户的角色信息 + String isAdmin = ""; + isAdmin = user.getIsAdmin(); SysUserVo userInfoOneVo = new SysUserVo(); userInfoOneVo.setToken(user.getToken()); userInfoOneVo.setId(user.getId()); @@ -416,6 +418,9 @@ public class SysUserService extends MybatisBaseService { } } userInfoOneVo.setOrgList(orgList); + if("1".equals(isAdmin)){ + userInfoOneVo.setPostName(roleName); + } return userInfoOneVo; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index beb3a3f443..fb828a3a8e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -302,7 +302,7 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean getFlowOperateTitleBy(@SpringQueryMap SaleOrderQuery query); - @ApiOperation("办理") + @ApiOperation("销售支持部经理办理") @PutMapping("/agreeSaleOrderInfoBy") @ResponseBody ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java index 08f9497e5b..935c0d8d61 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java @@ -1,6 +1,5 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; -import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.anrui.terminal.api.base.common.SystemVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; @@ -22,9 +21,9 @@ public class FlowOrderVo implements Vo { private List list; //默认的采购系统 @ApiModelProperty("部门sid") - @JsonProperty("dictKey") private String purchaseSystemSid; @ApiModelProperty("采购系统名称") - @JsonProperty("dictValue") private String purchaseSystemName; + @ApiModelProperty("是否显示") + private boolean isShow; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 3f7a7b509c..ece478da9c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -672,6 +672,11 @@ public class AppBusSalesOrderService { List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList()); flowOrderVo.setList(list); } + if("3".equals(busSalesOrder.getType())){ + flowOrderVo.setShow(true); + }else{ + flowOrderVo.setShow(false); + } } return rb.success().setData(flowOrderVo); }