问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -94,8 +94,8 @@ public interface BaseVehicleModelFeign {
      * @return
      */
     @ApiOperation("详情")
-    @GetMapping("/details/{sid}")
-    public ResultBean<BaseVehicleModelDetailsVo> details(@PathVariable("sid") String sid);
+    @GetMapping("/details/{sid}/{useOrgSid}")
+    public ResultBean<BaseVehicleModelDetailsVo> details(@PathVariable("sid") String sid,@PathVariable("useOrgSid") String useOrgSid);
 
     /**
      * 修改回显

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -53,11 +53,10 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelDetailsVo> details(String sid) {
+    public ResultBean<BaseVehicleModelDetailsVo> details(String sid,String useOrgSid) {
         return null;
     }
 
-
     @Override
     public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
         return null;
@@ -65,7 +64,6 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
 
     @Override
     public void exportExcel(BaseVehicleModelExportQuery query) {
-
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -89,7 +89,7 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
 
     List<Map<String, Object>> getOneLevelList(String sid);
 
-    @Select("select count(*) from base_distributor where pDistributorSid = #{sid}")
+    @Select("select count(*) from base_distributor where pDistributorSid = #{sid} and isDelete = 0")
     int selByPDisSid(String sid);
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -82,7 +82,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         IPage<BaseDistributorVo> baseDistributorVoIPage = baseMapper.pagerList(page, qw);
         List<BaseDistributorVo> baseDistributorVo = new ArrayList<>();
         List<BaseDistributorVo> records = baseDistributorVoIPage.getRecords();
-        for (BaseDistributorVo record : records) {
+        /*for (BaseDistributorVo record : records) {
             String sid = record.getSid();
             int i = baseMapper.selByPDisSid(sid);
             if (i > 0){
@@ -90,7 +90,7 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             }else {
                 record.setIsRelation("0");
             }
-        }
+        }*/
         String relationState = pagerQuery.getParams().getRelationState();
         if (StringUtils.isNotBlank(relationState)){
             if (relationState.equals("0")){//未关联

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -153,9 +153,9 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelDetailsVo> details(String sid) {
+    public ResultBean<BaseVehicleModelDetailsVo> details(String sid,String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-        BaseVehicleModelDetailsVo vo = baseVehicleModelService.details(sid);
+        BaseVehicleModelDetailsVo vo = baseVehicleModelService.details(sid,useOrgSid);
         if (vo == null) {
             return rb.setMsg("该车型信息不存在");
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -150,7 +150,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @param sid 车型sid
      * @return
      */
-    public BaseVehicleModelDetailsVo details(String sid) {
+    public BaseVehicleModelDetailsVo details(String sid,String useOrgSid) {
         BaseVehicleModel baseVehicleModel = this.fetchBySid(sid);
         BaseVehicleModelDetailsVo baseVehicleModelDetailsVo = baseMapper.details(sid);
         if (StringUtils.isNotBlank(baseVehicleModel.getUseOrg())) {//使用组织sid
@@ -170,7 +170,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
         List<BaseModelConfigVo> baseModelConfigVos = new ArrayList<>();
 
-        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid);
+        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid,useOrgSid);
         if (baseVehmodelConfigVos.size() > 0){
             for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
                 BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@@ -123,7 +123,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
 
     List<BaseVehmodelConfigVo> getListByConfigSid(String sid);
 
-    List<BaseVehmodelConfigVo> getVehModByModelSid(String sid);
+    List<BaseVehmodelConfigVo> getVehModByModelSid(@Param("sid") String sid,@Param("useOrgSid") String useOrgSid);
 
     int checkByConfigSid(String sid);
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -263,6 +263,7 @@
         SELECT *
         FROM base_vehmodel_config
         WHERE modelSid = #{sid}
+        AND useOrgSid = #{useOrgSid}
     </select>
 
     <select id="checkByConfigSid" resultType="int">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -543,8 +543,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return baseMapper.getListByConfigSid(sid);
     }
 
-    public List<BaseVehmodelConfigVo> getVehModByModelSid(String sid) {
-        return baseMapper.getVehModByModelSid(sid);
+    public List<BaseVehmodelConfigVo> getVehModByModelSid(String sid,String useOrgSid) {
+        return baseMapper.getVehModByModelSid(sid,useOrgSid);
     }
 
     public int checkByConfigSid(String sid) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.portal.api.sysuser;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,6 +32,9 @@ public class SysUserVo implements Vo {
     private String departmentSid;
 	@ApiModelProperty("部门名称")
     private String departmentName;
+    @ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
+    @JsonProperty("pNameAndDepartmentNameAndPostName")
+    private String pNameAndDepartmentNameAndPostName;
 	@ApiModelProperty("岗位名称")
     private String  postName;
 	@ApiModelProperty("岗位Sid")

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.java

@@ -57,6 +57,6 @@ public interface SysStaffPostMapper extends BaseMapper<SysStaffPost> {
      */
     SysStaffPostDetailsVo selectByStaff(@Param("sid") String sid, @Param("postSid") String postSid);
 
-    @Select("select * from sys_staff_post where staffSid = #{sid}")
     SysStaffPostDetailsVo getPostByStaffSid(String sid);
+
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffpost/SysStaffPostMapper.xml

@@ -32,4 +32,12 @@
         left join sys_post sp on sp.sid = ssp.postSid
         where ssp.staffSid = #{sid} and ssp.postSid = #{postSid}
     </select>
+
+    <select id="getPostByStaffSid" resultType="com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo">
+        select ssp.*,sp.name from sys_staff_post ssp
+        left join sys_post sp
+            on ssp.postSid = sp.sid
+        where ssp.staffSid = #{sid}
+                LIMIT 1
+    </select>
 </mapper>

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

@@ -12,6 +12,8 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
+import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo;
 import com.yxt.anrui.portal.api.sysuser.*;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.api.sysuser.wx.WxHomePageVo;
@@ -21,6 +23,7 @@ import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
 import com.yxt.anrui.portal.biz.sysrole.SysRoleService;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
+import com.yxt.anrui.portal.biz.sysstaffpost.SysStaffPostService;
 import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.portal.utils.MsgWs;
@@ -87,13 +90,11 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     @Autowired
     private CrmCustomerFeign crmCustomerFeign;
     @Autowired
-    private SysUserRoleService sysUserRoleService;
-    @Autowired
-    private SysRoleService sysRoleService;
-    @Autowired
     private SysOrganizationService sysOrganizationService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private SysStaffPostService sysStaffPostService;
 
     @Autowired
     private ImageUploadUtil imageUploadUtil;
@@ -314,9 +315,16 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 userInfoOneVo.setOrganizationName("无单位");
                 userInfoOneVo.setDepartmentName("无部门");
                 List<SysStaffOrgVo> orgVoList = sysStaffOrgService.getSysStaffOrgListByStaffSid(user.getStaffSid());
+                SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(user.getStaffSid());
+                userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid());
+                userInfoOneVo.setPostName(staffPostDetailsVo.getName());
                 if (orgVoList.size() > 0) { // 手机端销售人员用到orgsid,目前按唯一算
                     SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0);
                     userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
+                    userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
+                    String psid = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()).getPsid();
+                    String name = sysOrganizationService.fetchBySid(psid).getName();
+                    userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" +sysStaffOrgVo.getOrgName() + " " + userInfoOneVo.getPostName());
                     userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid());
                     userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName());
                     userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());