修改问题

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -2208,6 +2208,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     finConfirmDto.setPurchaseSystemSid(busDeposit.getPurchaseSystemSid());
                     ResultBean<String> codeString = finCollectionConfirmationFeign.getApplyCode(busMainDeposit.getOrgSid());
                     finConfirmDto.setBillNo(codeString.getData());
+                    finConfirmDto.setStaffName(busDeposit.getStaffName());
+                    finConfirmDto.setStaffUserSid(busMainDeposit.getCreateBySid());
+                    finConfirmDto.setStaffDeptName(finConfirmDto.getCreateDept());
+                    finConfirmDto.setStaffDeptSid(finConfirmDto.getCreateDeptSid());
                     finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
                 }
                 if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -125,4 +125,13 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员部门名称")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员部门sid")
+    private String staffDeptSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java

@@ -116,5 +116,14 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
 
     private String reason;
 
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员部门名称")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员部门sid")
+    private String staffDeptSid;
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java

@@ -121,4 +121,13 @@ public class FinCollectionConfirmationDto implements Dto {
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
 
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员部门名称")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员部门sid")
+    private String staffDeptSid;
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java

@@ -92,6 +92,15 @@ public class FinConfirmDto implements Dto {
     @ApiModelProperty("单据编号")
     private String billNo;
 
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员部门名称")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员部门sid")
+    private String staffDeptSid;
+
 
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -289,6 +289,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             //对收款申请进行赋值操作
             FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
             BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
+            if(StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())){
+                finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
+                finCollectionConfirmation.setStaffUserSid(finCollectionConfirmation.getCreateBySid());
+                finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
+                finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid());
+            }
             sid = finCollectionConfirmation.getSid();
             //根据用户sid查询分公司sid
             String useOrgSid = "";

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

@@ -14,4 +14,5 @@ public class SysOrgStaffVo implements Vo {
 
     private String staffName;
     private String staffSid;
+    private String userSid;
 }

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

@@ -188,10 +188,11 @@
     </select>
 
     <select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
-        select distinct si.name staffName, si.sid staffSid
+        select distinct si.name staffName, si.sid staffSid,su.sid userSid
         from sys_staff_org so
                  left join sys_staffinfo si on so.staffSid = si.sid
-        where so.orgSid = #{orgDeptSid}
+        left join sys_user su on su.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid} and si.personTypeKey != '01'
     </select>
 
     <select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">

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

@@ -1272,6 +1272,20 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 OrgList orgList1 = new OrgList();
                 orgList1.setOrgPath(vv.getOrgSidPath());
                 orgList1.setOrgName(vv.getOrgNamePath());
+                String orgName = "";
+                if (StringUtils.isNotBlank(vv.getOrgSidPath())) {
+                    List<String> split = Arrays.asList(vv.getOrgSidPath().split("/"));
+                    if(split.size()>1){
+                        //获取本级sid获取本级部门信息
+                        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size()-2));
+                        SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size()-1));
+                        orgName = sysOrganization.getName()+"/"+sysOrganization1.getName();
+                    }else{
+                        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
+                        orgName = sysOrganization.getName();
+                    }
+                    orgList1.setOrgName(orgName);
+                }
                 orgList.add(orgList1);
             }
         }