问题修改

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<String> 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<String> stringList = sysUserService.getPost(staffSid);
+            stringList.removeAll(Collections.singleton(null));
+            if (!stringList.isEmpty()) {
+                appContactsDetailsVo.setPosition(String.join("|", stringList));
+            }
+        }
+
         return new ResultBean<AppContactsDetailsVo>().success().setData(appContactsDetailsVo);
     }
 

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<SysUserMapper, SysUser> {
     //公共的方法
     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<SysUserMapper, SysUser> {
             }
         }
         userInfoOneVo.setOrgList(orgList);
+        if("1".equals(isAdmin)){
+            userInfoOneVo.setPostName(roleName);
+        }
         return userInfoOneVo;
     }
 

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<FlowOrderVo> getFlowOperateTitleBy(@SpringQueryMap SaleOrderQuery query);
 
-    @ApiOperation("办理")
+    @ApiOperation("销售支持部经理办理")
     @PutMapping("/agreeSaleOrderInfoBy")
     @ResponseBody
     ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto);

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<SystemVo> list;
     //默认的采购系统
     @ApiModelProperty("部门sid")
-    @JsonProperty("dictKey")
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
-    @JsonProperty("dictValue")
     private String purchaseSystemName;
+    @ApiModelProperty("是否显示")
+    private boolean isShow;
 }

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<SystemVo> 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);
     }