From aa0eff57031e26bab25f4cce1a17d5c1fccee4c9 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sat, 17 Sep 2022 09:23:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=80=89=E6=8B=A9=E4=B8=BB=E7=AE=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=92=8C=E5=88=86=E7=AE=A1=E4=BA=BA=E5=91=98=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/organizationManage/organizationManage.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue index a8ee76fbe0..0c354650ea 100644 --- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue +++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue @@ -347,7 +347,7 @@ export default { mounted() { this.getOrgTree() // this.getStaff() - this.getStaff2() + // this.getStaff2() // this.getPageList() }, methods: { @@ -417,11 +417,11 @@ export default { this.form.address = data.orgAddress || data.address this.form.dlxx = data.gisInfo || data.dlxx this.getStaff(data.sid) - this.getStaff2() + this.getStaff2(data.sid) }, editRow(row) { this.getStaff(row.sid) - this.getStaff2() + this.getStaff2(row.sid) this.dialogTitle = '编辑' this.isshow = 'edit' selectBySid(row.sid).then((response) => { @@ -456,7 +456,7 @@ export default { }, deit(data) { // 节点编辑保存 this.getStaff(data.sid) - this.getStaff2() + this.getStaff2(data.sid) console.log(data, 8888) this.dialogVisible = true // this.form = Object.assign({}, data) @@ -541,8 +541,8 @@ export default { // console.log('name:', this.temp.payType, 'key:', this.temp.payTypeKey) }, // 分管人员 - getStaff2() { - getStaffName().then(res => { + getStaff2(orgSid) { + getStaffName({ deptSid: orgSid }).then(res => { this.staffdata2 = res.data console.log('分管人员', this.staffdata2) }) From 973698752cdd11a3f05c7ab17f07a39954924cca Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 17 Sep 2022 09:59:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E5=88=86=E7=AE=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=91=98=E5=B7=A5=E4=BF=AE=E6=94=B9=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=90=88=E5=90=8C=E5=A4=9A=E6=AC=A1=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonContractBuscenterVo.java | 2 + .../commoncontract/CommonContractService.java | 97 ++++++------- .../api/sysstaffinfo/SysStaffinfoFeign.java | 2 +- .../SysStaffinfoFeignFallback.java | 2 +- .../sysorganization/SysOrganizationRest.java | 4 +- .../SysOrganizationService.java | 2 +- .../portal/biz/sysrole/SysRoleMapper.java | 4 + .../portal/biz/sysrole/SysRoleMapper.xml | 13 ++ .../portal/biz/sysrole/SysRoleService.java | 21 +-- .../biz/sysstaffinfo/SysStaffinfoMapper.xml | 130 +++++++++--------- .../biz/sysstaffinfo/SysStaffinfoRest.java | 4 +- .../biz/sysstaffinfo/SysStaffinfoService.java | 7 +- .../portal/biz/sysuser/SysUserService.java | 15 +- 13 files changed, 166 insertions(+), 137 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java index dbb7107f56..4e4b066971 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java @@ -88,4 +88,6 @@ public class CommonContractBuscenterVo implements Vo { @ApiModelProperty("附件文件") private List pcCommonAppendixDtoList; + private String commonContractUrl; + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 50bd9585b7..73111fa471 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1372,52 +1372,57 @@ public class CommonContractService extends MybatisBaseService future3 = pool.submit(() -> { - //新增合同信息 - CommonContract commonContract = new CommonContract(); - //合同编号 - commonContract.setContractNo(contractNo); - //合同类型 - if("现车".equals(appOrderDetailsVo.getOrderType())){ - commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode()); - commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks()); - }else{ - commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode()); - commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks()); - } - //客户sid - commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid()); - //业务员sid、业务员 - commonContract.setStaffSid(appOrderDetailsVo.getUserSid()); - commonContract.setStaffName(appOrderDetailsVo.getSellerName()); - //分公司sid - commonContract.setOrgSid(appOrderDetailsVo.getOrgSid()); - //业务表sid - commonContract.setBusSid(dto.getBusSid()); - //甲方名称、乙方名称、其他方名称、 - commonContract.setPartyA(createOrgName); - commonContract.setPartyB(customerName); - //签订日期、签订地点 - //订金、合同金额 - commonContract.setDeposit(new BigDecimal(depositTotal)); - commonContract.setContractAmount(depositTotal); - //合同附件 - //身份证信息附件 - //车型sid - commonContract.setModelSid(appOrderModelInfoVo.getModelSid()); - //车型名称 - commonContract.setModelName(appOrderModelInfoVo.getModelName()); - //车辆台数 - commonContract.setNum(Integer.valueOf(num).intValue()); - //车辆单价 - commonContract.setPrice(new BigDecimal(transactionPrice)); - //单台订金 - commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit())); - commonContract.setCommonContractUrl(finalUrl); - save(commonContract); - return commonContract.getSid(); - }); + //根据销售订单sid查询合同表中是否存在 + CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid()); + if (StringUtils.isBlank(commonContractBuscenterVo.getCommonContractUrl())) { + String finalUrl = url; + Future future3 = pool.submit(() -> { + //新增合同信息 + CommonContract commonContract = new CommonContract(); + //合同编号 + commonContract.setContractNo(contractNo); + //合同类型 + if ("现车".equals(appOrderDetailsVo.getOrderType())) { + commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode()); + commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks()); + } else { + commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode()); + commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks()); + } + //客户sid + commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid()); + //业务员sid、业务员 + commonContract.setStaffSid(appOrderDetailsVo.getUserSid()); + commonContract.setStaffName(appOrderDetailsVo.getSellerName()); + //分公司sid + commonContract.setOrgSid(appOrderDetailsVo.getOrgSid()); + //业务表sid + commonContract.setBusSid(dto.getBusSid()); + //甲方名称、乙方名称、其他方名称、 + commonContract.setPartyA(createOrgName); + commonContract.setPartyB(customerName); + //签订日期、签订地点 + //订金、合同金额 + commonContract.setDeposit(new BigDecimal(depositTotal)); + commonContract.setContractAmount(depositTotal); + //合同附件 + //身份证信息附件 + //车型sid + commonContract.setModelSid(appOrderModelInfoVo.getModelSid()); + //车型名称 + commonContract.setModelName(appOrderModelInfoVo.getModelName()); + //车辆台数 + commonContract.setNum(Integer.valueOf(num).intValue()); + //车辆单价 + commonContract.setPrice(new BigDecimal(transactionPrice)); + //单台订金 + commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit())); + commonContract.setCommonContractUrl(finalUrl); + save(commonContract); + return commonContract.getSid(); + }); + } + } catch (Exception e) { e.printStackTrace(); return rb.setMsg("生成文件失败"); diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index 84ed4479d2..f07876c1ea 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -94,7 +94,7 @@ public interface SysStaffinfoFeign { */ @ApiOperation("获取集团内全部员工姓名") @GetMapping("/getStaffName") - public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName); + public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid); /** * 获取部门内全部员工姓名 diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 0faffcc255..28d4cce35d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -54,7 +54,7 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { } @Override - public ResultBean>> getStaffName(String staffName) { + public ResultBean>> getStaffName(String staffName,String deptSid) { return null; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 0e861a6711..ae3f0e87ab 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -118,12 +118,12 @@ public class SysOrganizationRest implements SysOrganizationFeign { } //删除关联关系中的所有主管与分管的人员关系 sysStaffOrgService.delZGAndFGByOrgSid(sid); - if (StringUtils.isNotBlank(zgStaffSid)) { + /*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()) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index efda60251c..cfce32800f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -167,7 +167,7 @@ public class SysOrganizationService extends MybatisBaseService0){ - return rb.setMsg(sysStaffinfo.getName()+"已在本部门"); + return rb.setMsg(sysStaffinfo.getName()+"已在本部门，不能设置分管"); } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java index 733a34c28a..11ad8a6991 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.java @@ -55,4 +55,8 @@ public interface SysRoleMapper extends BaseMapper { String getLevelType(String roleSid); String selectRoleSid(String userRoleSid); + + String selectByUserSid(String sid); + + List selectByUser(String userSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml index 0dae45a6e0..012ed2ae0b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml @@ -77,4 +77,17 @@ left join sys_role ssr on ssp.sid = ssr.postSid where sr.sid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java index 2330f70cd5..cd8d0b4bde 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleService.java @@ -3,18 +3,15 @@ package com.yxt.anrui.portal.biz.sysrole; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.commons.lang3.StringUtils; +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.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.portal.api.sysrole.SysRole; -import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; -import com.yxt.anrui.portal.api.sysrole.SysRoleVo; -import com.yxt.anrui.portal.api.sysrole.SysRoleDto; -import com.yxt.anrui.portal.api.sysrole.SysRoleFeign; - +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -157,4 +154,12 @@ public class SysRoleService extends MybatisBaseService { public String selectRoleSid(String userRoleSid) { return baseMapper.selectRoleSid(userRoleSid); } + + public String selectByUserSid(String sid) { + return baseMapper.selectByUserSid(sid); + } + + public List selectByUser(String userSid) { + return baseMapper.selectByUser(userSid); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index f501fea28d..e0966d0fbb 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -9,21 +9,21 @@ SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage FROM sys_staffinfo staff LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName @@ -68,14 +68,15 @@ FROM sys_staff_org org INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid LEFT JOIN sys_user user - ON staff.sid = user.staffSid + ON staff.sid = user.staffSid WHERE org.orgSid = #{sid} 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 de51e31ec5..87d5139a13 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 @@ -135,9 +135,9 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { } @Override - public ResultBean>> getStaffName(String staffName) { + public ResultBean>> getStaffName(String staffName,String deptSid) { ResultBean rb = ResultBean.fireFail(); - List> staffNameList = sysStaffinfoService.getStaffName(staffName); + List> staffNameList = sysStaffinfoService.getStaffName(staffName,deptSid); return rb.success().setData(staffNameList); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 8c2b4d2261..770f90ecaa 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -605,12 +605,13 @@ public class SysStaffinfoService extends MybatisBaseService> getStaffName(String staffName) { + public List> getStaffName(String staffName,String deptSid) { QueryWrapper> qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(staffName)) { - qw.like("name", staffName); + qw.like("ss.name", staffName); } - qw.eq("isDelete", 0); + qw.eq("ss.isDelete", 0); + qw.ne("sso.orgSid", deptSid); return baseMapper.getStaffName(qw); } 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 66b97e66c1..274159cccf 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 @@ -8,7 +8,6 @@ import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.portal.api.sms.SmsFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; -import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -337,7 +336,8 @@ public class SysUserService extends MybatisBaseService { 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.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName() + " " + userInfoOneVo.getPostName()); + userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName()); userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid()); userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName()); userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath()); @@ -348,8 +348,8 @@ public class SysUserService extends MybatisBaseService { // 设置用户的角色sids List roleSids = this.getUserRoleSids(user.getSid()); userInfoOneVo.setRoleSids(roleSids); - if (userInfoOneVo.getRoleSids().contains("000003") || userInfoOneVo.getRoleSids().contains("000004")) { - } + String roleName = sysRoleService.selectByUserSid(user.getSid()); + userInfoOneVo.setRoleName(roleName); return userInfoOneVo; } @@ -385,12 +385,7 @@ public class SysUserService extends MybatisBaseService { * @return */ public List getUserRoleSids(String userSid) { - List list = new ArrayList<>(); - List orgTypeKeys = new ArrayList<>(); - SysRoleQuery roleQuery = new SysRoleQuery(); - //用户类别来区分是系统管理、单位管理员1、单位一般用户2、尚无单位用户 - roleQuery.setType(1); - return list; + return sysRoleService.selectByUser(userSid); } public SysUser fetchByUserName(String mobile) { From 69b75768f46fcadf8c6442a1790ecbb0bb019304 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 17 Sep 2022 10:50:33 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/api/commoncontract/CommonContract.java | 2 ++ .../base/biz/commoncontract/CommonContractService.java | 6 +++++- .../java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index 372dccf60d..a4c330bcf2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -111,4 +111,6 @@ public class CommonContract extends BaseEntity { private String taskId; @ApiModelProperty("生成的合同的url") private String commonContractUrl; + + private String configSid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 73111fa471..2832d24a98 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1402,8 +1402,11 @@ public class CommonContractService extends MybatisBaseService