修改问题

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppCarConfigSummaryDto.java

@@ -28,4 +28,9 @@ public class AppCarConfigSummaryDto implements Dto {
     @ApiModelProperty("车型名称")
     private String model;
 
+    @ApiModelProperty("选装")
+    private String choiceConfig;
+    @ApiModelProperty("换装")
+    private String changeConfig;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -82,7 +82,10 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
 
-    @ApiModelProperty("申请人orgSidPath")
+    @ApiModelProperty("申请人orgSidPath：后端自己获取的")
     private String orgSidPath;
 
+    @ApiModelProperty("当前组织机构全路径sid")
+    private String orgPath;
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -224,7 +224,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {//新增
             //=======================================
-            String orgSidPath = dto.getOrgSidPath();
+            String orgSidPath = "";
+            if(StringUtils.isNotBlank(dto.getOrgPath())){
+                orgSidPath = dto.getOrgPath();
+            }else{
+                orgSidPath = dto.getOrgSidPath();
+            }
             if(StringUtils.isBlank(orgSidPath)){
                 //根据用户sid获取staffSid
                 ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
@@ -360,18 +365,23 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         } else {
             return rb.setMsg("请选择车型");
         }
-        //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }
         //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        String orgSidPath = "";
+        if(StringUtils.isNotBlank(dto.getOrgPath())){
+            orgSidPath = dto.getOrgPath();
+        }else{
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        }
         AtomicReference<BusVehicleApply> busVehicleApply = new AtomicReference<>(fetchBySid(dto.getSid()));
         int r = submitBusinessData(dto, busVehicleApply.get());
         if (r == 3) {
@@ -598,13 +608,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     if (baseManufacturer !=null){
                         finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode());
                     }
-                  /*  List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid());
-                    busApplyVo.removeAll(Collections.singleton(null));
-                    if (!busApplyVo.isEmpty()) {
-                        finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
-                        finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
-                        finPaymentrecordDto.setPayCode(busApplyVo.get(0).getCode());
-                    }*/
                     finPaymentrecordDto.setBusSid(r.getData());
                     finPaymentrecordFeign.save(finPaymentrecordDto);
                 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java

@@ -52,6 +52,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -426,6 +427,7 @@ public class BusVehicleOfferService extends MybatisBaseService<BusVehicleOfferMa
 //            baseVehmodelConfig.setConfigurationItemsSid(busVehicleOfferDetailVo.getVehModelConfigSid());
             baseVehmodelConfig.setConfigurationItemsSid(baseModelConfig.getSid());
             baseVehmodelConfig.setUseOrgSid(busVehicleOfferDetailVo.getCreateOrgSid());
+            baseVehmodelConfig.setGuidedPrice(new BigDecimal(busVehicleOfferDetailVo.getSalePrice()));
             baseVehmodelConfigService.save(baseVehmodelConfig);
             BeanUtil.copyProperties(busVehicleOfferDetailVo, busVehicleOffer);
             busVehicleOffer.setSid(sid);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@@ -61,5 +61,7 @@ public class BusSalesOrderVehicle extends BaseEntity {
 
     @ApiModelProperty("上装sid")
     private String topSid;
+    @ApiModelProperty("临时号")
+    private String temporaryNo;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -69,4 +69,9 @@ public interface BusSalesOrderVehicleFeign {
     @GetMapping("/fetchByVehSid/{vehSid}")
     @ResponseBody
     ResultBean<List<BusSalesOrderVehicle>> fetchByVehSid(@PathVariable("vehSid") String vehSid);
+
+    @ApiOperation("根据销售订单车辆表的sid更新临时号码")
+    @PostMapping("/updateTemporaryNo")
+    @ResponseBody
+    ResultBean updateTemporaryNo(@RequestParam("sid")String sid,@RequestParam("temporaryNo")String temporaryNo);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -63,4 +63,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -96,4 +97,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusSalesOrderVehicle> fetchByVehSid(String vehSid);
 
     List<VinListsVo> selectListBySids(String sid);
+
+    int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -63,4 +63,8 @@
     <select id="selectListBySids" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo">
         select sid,linkSid as vinSid,linkNo as vinNo from bus_sales_order_vehicle where salesOrderSid = #{sid}
     </select>
+
+    <update id="updateTemporaryNo">
+        update bus_sales_order_vehicle set temporaryNo = #{temporaryNo} where sid = #{sid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -73,5 +73,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.fetchByVehSid(vehSid);
     }
 
+    @Override
+    public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
+        return busSalesOrderVehicleService.updateTemporaryNo(sid,temporaryNo);
+    }
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -206,4 +206,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         }
         return list;
     }
+
+    public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateTemporaryNo(sid,temporaryNo);
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/FinCostapplyDto.java

@@ -83,7 +83,9 @@ public class FinCostapplyDto implements Dto {
     private String busSid;
     @ApiModelProperty(value = "备注")
     private String remarks;
-
+    @ApiModelProperty("不是前端传的，是后端自己取的")
     private String orgSidPath;
+    @ApiModelProperty("切换机构：组织机构全路径")
+    private String orgPath;
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincostapply/FinCostapplyService.java

@@ -53,7 +53,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -264,7 +263,14 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
             return rb.setMsg(staffOrgResultBean.getMsg());
         }
         //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        String orgSidPath = "";
+        String orgPath = dto.getOrgPath();
+        if(StringUtils.isNotBlank(orgPath)){
+            orgSidPath = orgPath;
+        }else{
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        }
+//        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         FinCostapply finCostapply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, finCostapply);
         if (r == 3) {
@@ -295,23 +301,8 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         bv.setFormVariables(variables);
         //流程定义id
         bv.setModelId(ProcDefEnum.FINCOSTAPPLY.getProDefId());
-        //根据员工sid查询员工的上级岗位
-       /* ResultBean<String> sysPostVoResultBean = sysStaffPostFeign.selectPost(userVoResultBean.getData().getStaffSid());
-        if (!sysPostVoResultBean.getSuccess()) {
-            return rb.setMsg(sysPostVoResultBean.getMsg());
-        }
-        String roleSid = sysPostVoResultBean.getData();
-        //根据组织架构、角色两个参数取相关符合条件的用户信息
-        UserQuery userQuery = new UserQuery();
-        userQuery.setRoleSid(roleSid);
-        userQuery.setOrgSidPath(orgSidPath);
-        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
-        sysUserVos.removeAll(Collections.singleton(null));
-        if (sysUserVos.isEmpty()) {
-            return rb.setMsg("下一环节没有用户");
-        }*/
         //根据员工的sid查询员工的角色
-        String userSid = dto.getCreateBySid();
+        /*String userSid = dto.getCreateBySid();
         ResultBean<List<String>> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid);
         UserRoleQuery userRoleQuery = new UserRoleQuery();
         if (userRoleList.getData().size() > 0) {
@@ -333,6 +324,16 @@ public class FinCostapplyService extends MybatisBaseService<FinCostapplyMapper,
         }
         //符合条件的用户的sid,拼接的字符串
         String nextNodeUserSids_ = nextNodeUserSids.toString();
+        bv.setNextNodeUserSids(nextNodeUserSids_);*/
+        List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size()-1)).getData();
+        if(sysOrganization == null){
+            return rb.setMsg("当前所在的组织机构不存在");
+        }
+        if(StringUtils.isBlank(sysOrganization.getManagerSid())){
+            return rb.setMsg("当前所在的组织机构未设置主管人员");
+        }
+        String nextNodeUserSids_ = sysOrganization.getManagerSid();
         bv.setNextNodeUserSids(nextNodeUserSids_);
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java

@@ -84,4 +84,9 @@ public class SysOrganization extends BaseEntity {
 
     @ApiModelProperty("其他编码")
     private String otherCode;
+
+    @ApiModelProperty("主管人员sid")
+    private String managerSid;
+    @ApiModelProperty("主管人员姓名")
+    private String managerName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java

@@ -83,4 +83,6 @@ public class SysOrganizationVo implements Vo {
     private String orgLevelValue;
     @ApiModelProperty("其他编码")
     private String otherCode;
+    @ApiModelProperty("主管用户sid")
+    private String managerSid;
 }

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

@@ -0,0 +1,24 @@
+package com.yxt.anrui.portal.api.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/12 9:37
+ * @Description
+ */
+@Data
+public class SysMenuRoleVoList implements Vo {
+    private static final long serialVersionUID = 5964551098152631513L;
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    @ApiModelProperty("角色名称")
+    private String roleName;
+    @ApiModelProperty("角色层级")
+    private String roleType;
+    @ApiModelProperty("角色层级value")
+    private String roleTypeValue;
+}

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

@@ -3,6 +3,7 @@ package com.yxt.anrui.portal.api.sysuser;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.portal.api.sysuser.app.OrgList;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -232,4 +233,18 @@ public interface SysUserFeign {
     @ApiOperation(value = "查询是否需要更换密码")
     @GetMapping(value = "/selectPasswordByUserSid/{userSid}")
     ResultBean<Boolean> selectPasswordByUserSid(@PathVariable("userSid")String userSid);
+
+    /**
+     * 查询该菜单是否允许创建，是否有提醒消息
+     * @param menuSid 菜单sid
+     * @param orgPath 当前组织机构全路径sid
+     * @return
+     */
+    @ApiOperation(value = "查询该菜单是否允许创建，是否有提醒消息")
+    @GetMapping(value = "/selectHaveMessage")
+    ResultBean selectHaveMessage(@RequestParam("menuSid")String menuSid,@RequestParam("orgPath")String orgPath);
+
+    @ApiOperation(value = "根据用户sid获取当前用户所有的组织机构list")
+    @GetMapping(value = "/getOrgListByUserSid")
+    ResultBean<List<OrgList>> getOrgListByUserSid(@RequestParam("userSid")String userSid);
 }

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

@@ -1,6 +1,7 @@
 package com.yxt.anrui.portal.api.sysuser;
 
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.anrui.portal.api.sysuser.app.OrgList;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -214,4 +215,14 @@ public class SysUserFeignFallback implements SysUserFeign {
 	public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean selectHaveMessage(String menuSid, String orgPath) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<OrgList>> getOrgListByUserSid(String userSid) {
+		return null;
+	}
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -5,7 +5,9 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment;
 import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.portal.api.sysorganization.*;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
@@ -61,6 +63,7 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     private RedisUtil redisUtil;
     @Resource
     private FinKingDeeFeign finKingDeeFeign;
+    private SysStaffinfoService sysStaffInfoService;
 
     @Override
     public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) {
@@ -121,29 +124,21 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         String zgStaffSid = dto.getZgStaffSid();
         //分管人员的sid
         String fgStaffSid = dto.getFgStaffSid();
-        //查询分管人员中是否包含主管人员
-        if (StringUtils.isNotBlank(fgStaffSid)) {
-            if (StringUtils.isNotBlank(zgStaffSid)) {
-                if (fgStaffSid.contains(zgStaffSid)) {
-                    return rb.setMsg("同一个组织机构中主管分管的人员不能重复");
-                }
-            }
+        if(StringUtils.isNotBlank(zgStaffSid)){
+            SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(zgStaffSid);
+            sysOrganization.setManagerName(sysStaffinfo.getName());
+            SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
+            sysOrganization.setManagerSid(sysUser.getSid());
         }
         //删除关联关系中的所有主管与分管的人员关系
         sysStaffOrgService.delZGAndFGByOrgSid(sid);
-        /*if (StringUtils.isNotBlank(zgStaffSid)) {
-            ResultBean resultBean = sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", sysOrganization);
-            if (!resultBean.getSuccess()) {
-                return rb.setMsg(resultBean.getMsg());
-            }
-        }*/
         if (StringUtils.isNotBlank(fgStaffSid)) {
             ResultBean resultBean = sysOrganizationService.addSysStaffOrg(fgStaffSid, "2", sysOrganization);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
         }
-        sysOrganizationService.updateBySid(dto.toMap(), sid);
+        sysOrganizationService.updateById(sysOrganization);
         //修改金蝶组织信息
         List<OrgOrganizations> orgOrganizationsList = new ArrayList<>();
         if (0 == dto.getIsDept()){

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -7,12 +7,14 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectQuery;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandSelectVo;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bddepartment.BdDepartment;
 import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
@@ -27,7 +29,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -258,13 +259,20 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         String psid = dto.getPsid();
         SysOrganization sysOrganization = this.fetchBySid(psid);
 
-        if (StringUtils.isNotBlank(zgStaffSid)) {
+       /* if (StringUtils.isNotBlank(zgStaffSid)) {
             this.addSysStaffOrg(zgStaffSid, "1", entity);
-        }
+        }*/
         if (StringUtils.isNotBlank(fgStaffSid)) {
             this.addSysStaffOrg(fgStaffSid, "2", entity);
         }
         entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
+        //根据主管人员sid获取主管姓名
+        if(StringUtils.isNotBlank(zgStaffSid)){
+            SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(zgStaffSid);
+            entity.setManagerName(sysStaffinfo.getName());
+            SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
+            entity.setManagerSid(sysUser.getSid());
+        }
         this.saveOrUpdate(entity);
         //推送金蝶组织信息
         if (0 == entity.getIsDept()) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysrole.SysRole;
 import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
+import com.yxt.anrui.portal.api.sysuser.SysMenuRoleVoList;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -59,4 +60,6 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
     String selectByUserSid(String sid);
 
 	List<String> selectByUser(String userSid);
+
+    List<SysMenuRoleVoList> selectRoleList(String menuSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml

@@ -90,4 +90,9 @@
         from sys_user_role
         where userSid = #{userSid}
     </select>
+
+    <select id="selectRoleList" resultType="com.yxt.anrui.portal.api.sysuser.SysMenuRoleVoList">
+        select sr.sid roleSid,sr.name roleName,sr.roleType,sr.roleTypeValue from sys_role sr left join sys_menu_role smr on sr.sid = smr.roleSid
+        where smr.menuSid = #{menuSid}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java

@@ -7,6 +7,7 @@ import com.yxt.anrui.portal.api.sysrole.SysRole;
 import com.yxt.anrui.portal.api.sysrole.SysRoleDto;
 import com.yxt.anrui.portal.api.sysrole.SysRoleQuery;
 import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
+import com.yxt.anrui.portal.api.sysuser.SysMenuRoleVoList;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -162,4 +163,8 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
     public List<String> selectByUser(String userSid) {
         return baseMapper.selectByUser(userSid);
     }
+
+    public List<SysMenuRoleVoList> selectRoleList(String menuSid) {
+        return baseMapper.selectRoleList(menuSid);
+    }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
+import com.yxt.anrui.portal.api.sysuser.SysMenuRoleVoList;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;

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

@@ -11,6 +11,7 @@ import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost;
 import com.yxt.anrui.portal.api.systemlog.SystemLog;
 import com.yxt.anrui.portal.api.sysuser.*;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.portal.api.sysuser.app.OrgList;
 import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
 import com.yxt.anrui.portal.biz.syspost.SysPostService;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
@@ -633,4 +634,14 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean<Boolean> selectPasswordByUserSid(String userSid) {
         return sysUserService.selectPasswordByUserSid(userSid);
     }
+
+    @Override
+    public ResultBean selectHaveMessage(String menuSid, String orgPath) {
+        return sysUserService.selectHaveMessage(menuSid,orgPath);
+    }
+
+    @Override
+    public ResultBean<List<OrgList>> getOrgListByUserSid(String userSid) {
+        return sysUserService.getOrgListByUserSid(userSid);
+    }
 }

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

@@ -1151,4 +1151,47 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     public int updateAppIdNull(String appId) {
         return baseMapper.updateAppIdNull(appId);
     }
+
+    public ResultBean selectHaveMessage(String menuSid, String orgPath) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据orgPath 查询当前组织所管理的层级
+        List<String> orgPathsList = Arrays.asList(orgPath.split("/"));
+        String orgSid = orgPathsList.get(orgPathsList.size()-1);
+        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
+        if(sysOrganization == null){
+            return rb.setMsg("当前所在组织机构不存在");
+        }
+        //根据菜单sid查询所授权的角色
+        List<SysMenuRoleVoList> list = sysRoleService.selectRoleList(menuSid);
+        list.removeAll(Collections.singleton(null));
+        if(!list.isEmpty()){
+            List<String> 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();
+    }
+
+    public ResultBean<List<OrgList>> getOrgListByUserSid(String userSid) {
+        ResultBean<List<OrgList>> rb = ResultBean.fireFail();
+        SysUser sysUser = fetchBySid(userSid);
+        List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sysUser.getStaffSid());
+        List<OrgList> orgList = new ArrayList<>();
+        if (sysStaffOrgVos.size() > 0) {
+            for (SysStaffOrgVo vv : sysStaffOrgVos) {
+                OrgList orgList1 = new OrgList();
+                orgList1.setOrgPath(vv.getOrgSidPath());
+                orgList1.setOrgName(vv.getOrgNamePath());
+                orgList.add(orgList1);
+            }
+        }
+        return rb.success().setData(orgList);
+    }
 }