From 2f2c60cbc15db620a1dd1c79faf51890003d2850 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 27 May 2024 18:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/api/asservicegroup/AsServiceGroup.java | 6 +- .../AsServiceGroupDetailsVo.java | 6 +- .../api/asservicegroup/AsServiceGroupDto.java | 4 +- .../asservicegroup/AsServiceGroupQuery.java | 4 + .../api/asservicegroup/AsServiceGroupVo.java | 2 +- .../asservicesubject/AsServiceSubject.java | 6 +- .../AsServiceSubjectDetailsVo.java | 6 +- .../asservicesubject/AsServiceSubjectDto.java | 4 +- .../AsServiceSubjectQuery.java | 4 + .../asservicesubject/AsServiceSubjectVo.java | 2 +- .../as/api/asservicetype/AsServiceType.java | 4 +- .../asservicetype/AsServiceTypeDetailsVo.java | 7 +- .../api/asservicetype/AsServiceTypeDto.java | 4 +- .../api/asservicetype/AsServiceTypeQuery.java | 4 + .../as/api/asservicetype/AsServiceTypeVo.java | 2 +- .../asservicegroup/AsServiceGroupMapper.java | 20 ++-- .../asservicegroup/AsServiceGroupMapper.xml | 8 +- .../asservicegroup/AsServiceGroupRest.java | 2 +- .../asservicegroup/AsServiceGroupService.java | 60 +++++++++++- .../AsServiceSubjectMapper.java | 20 ++-- .../AsServiceSubjectMapper.xml | 8 +- .../AsServiceSubjectRest.java | 2 +- .../AsServiceSubjectService.java | 60 +++++++++++- .../asservicetype/AsServiceTypeMapper.java | 19 ++-- .../biz/asservicetype/AsServiceTypeMapper.xml | 8 +- .../biz/asservicetype/AsServiceTypeRest.java | 2 +- .../asservicetype/AsServiceTypeService.java | 59 ++++++++++- .../PmsSupplierInfoMapper.java | 7 +- .../pmssupplierinfo/PmsSupplierInfoMapper.xml | 8 +- .../pmssupplierinfo/PmsSupplierInfoQuery.java | 7 ++ .../PmsSupplierInfoService.java | 59 +++++++++-- .../pmssupplierinfo/PmsSupplierInfoVo.java | 8 ++ .../PmsSupplierTypeMapper.java | 8 +- .../pmssuppliertype/PmsSupplierTypeMapper.xml | 4 +- .../pmssuppliertype/PmsSupplierTypeQuery.java | 4 + .../PmsSupplierTypeService.java | 52 ++++++++-- .../pms/feign/privilege/PrivilegeQuery.java | 22 +++++ .../com/yxt/pms/feign/sysuser/OrgList.java | 21 ++++ .../yxt/pms/feign/sysuser/SysUserFeign.java | 27 ++++++ .../com/yxt/pms/feign/sysuser/SysUserVo.java | 97 +++++++++++++++++++ 40 files changed, 550 insertions(+), 107 deletions(-) create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/feign/privilege/PrivilegeQuery.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/OrgList.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserFeign.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserVo.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java index d6e0233568..b29485dc76 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroup.java @@ -54,11 +54,13 @@ public class AsServiceGroup extends BaseEntity { private String groupName; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; @ApiModelProperty("创建组织名称") private String createOrgName; - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java index 74873ae80d..78650394b6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDetailsVo.java @@ -55,8 +55,12 @@ public class AsServiceGroupDetailsVo implements Vo { private String groupName; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java index ef814ec6e7..ebca202fce 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupDto.java @@ -57,8 +57,10 @@ public class AsServiceGroupDto implements Dto { private String groupName; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; @ApiModelProperty("创建组织名称") private String createOrgName; @ApiModelProperty("创建组织sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java index aca8d2daf5..9252d86455 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupQuery.java @@ -53,4 +53,8 @@ public class AsServiceGroupQuery implements Query { private String orgPath; @ApiModelProperty("班组名称") private String groupName; + + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java index 15b8e93a89..7db041eedc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupVo.java @@ -56,5 +56,5 @@ public class AsServiceGroupVo implements Vo { @ApiModelProperty("排序") private Integer sortNo; @ApiModelProperty("门店") - private String createOrgName; + private String useOrgName; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java index 07eb77aa0b..9ba34547e8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubject.java @@ -58,11 +58,13 @@ public class AsServiceSubject extends BaseEntity { private String subjectType; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; @ApiModelProperty("创建组织名称") private String createOrgName; - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java index 3035d1cdd8..f53de3750b 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDetailsVo.java @@ -59,8 +59,12 @@ public class AsServiceSubjectDetailsVo implements Vo { private String subjectType; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java index c692f63f2a..2d91ee723d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectDto.java @@ -61,8 +61,10 @@ public class AsServiceSubjectDto implements Dto { private String subjectType; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; @ApiModelProperty("创建组织名称") private String createOrgName; @ApiModelProperty("创建组织sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java index fce778e4f6..17be0bc438 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectQuery.java @@ -53,4 +53,8 @@ public class AsServiceSubjectQuery implements Query { private String orgPath; @ApiModelProperty("科目名称") private String subjectName; + + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java index e1daf15c87..d554e43ba3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicesubject/AsServiceSubjectVo.java @@ -60,5 +60,5 @@ public class AsServiceSubjectVo implements Vo { @ApiModelProperty("排序") private Integer sortNo; @ApiModelProperty("门店") - private String createOrgName; + private String useOrgName; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java index 3fc59d71a5..5eaa3f7ca0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceType.java @@ -62,8 +62,10 @@ public class AsServiceType extends BaseEntity { private BigDecimal percentageAmount; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; @ApiModelProperty("创建组织名称") private String createOrgName; @ApiModelProperty("创建组织sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java index 588c87d502..0543bbc418 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDetailsVo.java @@ -63,9 +63,12 @@ public class AsServiceTypeDetailsVo implements Vo { private BigDecimal percentageAmount; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; + @ApiModelProperty("创建组织名称") + private String createOrgName; @ApiModelProperty("创建组织sid") private String createOrgSid; - } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java index 90dd2c17d8..4ce02f19e0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeDto.java @@ -65,8 +65,10 @@ public class AsServiceTypeDto implements Dto { private BigDecimal percentageAmount; @ApiModelProperty("排序") private Integer sortNo; - @ApiModelProperty("使用组织sid") + @ApiModelProperty("部门sid") private String useOrgSid; + @ApiModelProperty("部门名称") + private String useOrgName; @ApiModelProperty("创建组织名称") private String createOrgName; @ApiModelProperty("创建组织sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java index 6e81efc543..fde40e64bb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeQuery.java @@ -55,4 +55,8 @@ public class AsServiceTypeQuery implements Query { private String orgPath; @ApiModelProperty("服务类别名称") private String serviceTypeName; + + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java index 5c1f496144..743e4abfdb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asservicetype/AsServiceTypeVo.java @@ -64,5 +64,5 @@ public class AsServiceTypeVo implements Vo { @ApiModelProperty("提成金额") private BigDecimal percentageAmount; @ApiModelProperty("门店") - private String createOrgName; + private String useOrgName; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java index decc2a5bb0..c9f02deee8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java @@ -30,11 +30,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupListVo; +import com.yxt.anrui.as.api.asservicetype.AsServiceType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.as.api.asservicegroup.AsServiceGroup; import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -54,21 +56,19 @@ import java.util.List; @Mapper public interface AsServiceGroupMapper extends BaseMapper { - //@Update("update as_service_group set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_service_group") - List selectListVo(); - List getGroupList(@Param("useOrgSid") String useOrgSid); - @Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid}") + @Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and isDelete = '0'") int checkByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid); - @Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}") + @Select("select count(*) from as_service_group where groupName = #{groupName} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'") int checkSidByCodeAndUseOrgSid(@Param("groupName") String groupName,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); + + @Update("update as_service_group set isDelete = '1' where sid = #{sid}") + void updateIsDeleteBySid(String sid); + + @Select("select * from as_service_group where sid = #{sid} and isDelete = '0'") + AsServiceGroup fetchIsDeleteBySid(String sid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml index df782a4f9f..bf5c0cf0ed 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml @@ -4,18 +4,16 @@ - diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java index f211736daf..754400fc44 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java @@ -83,7 +83,7 @@ public class AsServiceGroupRest { @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); - asServiceGroupService.delBySids(sids); + asServiceGroupService.delete(sids); return rb.success(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java index a5e78a6004..42ed7a6032 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java @@ -29,9 +29,12 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.as.api.asservicegroup.*; +import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo; +import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -66,16 +69,56 @@ public class AsServiceGroupService extends MybatisBaseService listPageVo(PagerQuery pq) { AsServiceGroupQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("asg.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } if (StringUtils.isNotBlank(query.getGroupName())){ - qw.like("groupName",query.getGroupName()); + qw.like("asg.groupName",query.getGroupName()); } - String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("createOrgSid",createOrgSid); - qw.orderByAsc("sortNo"); + qw.orderByAsc("asg.sortNo"); + qw.eq("asg.isDelete",0); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -106,6 +149,7 @@ public class AsServiceGroupService extends MybatisBaseService organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); @@ -146,7 +190,7 @@ public class AsServiceGroupService extends MybatisBaseService(); } + + public void delete(String[] sids) { + for (String sid : sids) { + baseMapper.updateIsDeleteBySid(sid); + } + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java index 7bace1592c..f32cb7b280 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.java @@ -29,11 +29,13 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.as.api.asservicetype.AsServiceType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.as.api.asservicesubject.AsServiceSubject; import com.yxt.anrui.as.api.asservicesubject.AsServiceSubjectVo; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -53,19 +55,17 @@ import java.util.List; @Mapper public interface AsServiceSubjectMapper extends BaseMapper { - //@Update("update as_service_subject set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_service_subject") - List selectListVo(); - - @Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid}") + @Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and isDelete = '0'") int checkByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid); - @Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}") + @Select("select count(*) from as_service_subject where subjectCode = #{subjectCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'") int checkSidByCodeAndUseOrgSid(@Param("subjectCode") String subjectCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); + + @Update("update as_service_subject set isDelete = '1' where sid = #{sid}") + void updateIsDeleteBySid(String sid); + + @Select("select * from as_service_subject where sid = #{sid} and isDelete = '0'") + AsServiceSubject fetchIsDeleteBySid(String sid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.xml index a983f0e70e..fd3b35d8bd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectMapper.xml @@ -4,10 +4,8 @@ - - \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java index 87b4618a88..84d33864cc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java @@ -78,7 +78,7 @@ public class AsServiceSubjectRest{ @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); - asServiceSubjectService.delBySids(sids); + asServiceSubjectService.delete(sids); return rb.success(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java index 1255f979ca..3fe91882f0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java @@ -28,9 +28,12 @@ package com.yxt.anrui.as.biz.asservicesubject; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.api.asservicetype.AsServiceTypeVo; +import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -69,16 +72,56 @@ public class AsServiceSubjectService extends MybatisBaseService listPageVo(PagerQuery pq) { AsServiceSubjectQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("ass.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } if (StringUtils.isNotBlank(query.getSubjectName())){ - qw.like("subjectName",query.getSubjectName()); + qw.like("ass.subjectName",query.getSubjectName()); } - String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("createOrgSid",createOrgSid); - qw.orderByAsc("sortNo"); + qw.orderByAsc("ass.sortNo"); + qw.eq("ass.isDelete",0); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -109,6 +152,7 @@ public class AsServiceSubjectService extends MybatisBaseService organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); @@ -149,9 +193,15 @@ public class AsServiceSubjectService extends MybatisBaseService { - //@Update("update as_service_type set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from as_service_type") - List selectListVo(); - - @Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid}") + @Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and isDelete = '0'") int checkByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid); - @Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid}") + @Select("select count(*) from as_service_type where serviceTypeCode = #{serviceTypeCode} and useOrgSid = #{useOrgSid} and sid != #{dtoSid} and isDelete = '0'") int checkSidByCodeAndUseOrgSid(@Param("serviceTypeCode") String serviceTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); + + @Update("update as_service_type set isDelete = '1' where sid = #{sid}") + void updateIsDeleteBySid(String sid); + + @Select("select * from as_service_type where sid = #{sid} and isDelete = '0'") + AsServiceType fetchIsDeleteBySid(String sid); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.xml index 9e57dd948a..01490a8ef6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeMapper.xml @@ -4,10 +4,8 @@ - - \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java index 7b531b3427..01477cf979 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeRest.java @@ -77,7 +77,7 @@ public class AsServiceTypeRest{ @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); - asServiceTypeService.delBySids(sids); + asServiceTypeService.delete(sids); return rb.success(); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java index c84b03dca2..69132fac44 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java @@ -28,9 +28,11 @@ package com.yxt.anrui.as.biz.asservicetype; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -69,16 +71,56 @@ public class AsServiceTypeService extends MybatisBaseService listPageVo(PagerQuery pq) { AsServiceTypeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("ast.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } if (StringUtils.isNotBlank(query.getServiceTypeName())){ - qw.like("serviceTypeName", query.getServiceTypeName()); + qw.like("ast.serviceTypeName", query.getServiceTypeName()); } - String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("createOrgSid",createOrgSid); - qw.orderByAsc("sortNo"); + qw.orderByAsc("ast.sortNo"); + qw.eq("ast.isDelete",0); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -109,6 +151,7 @@ public class AsServiceTypeService extends MybatisBaseService organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); @@ -150,9 +193,15 @@ public class AsServiceTypeService extends MybatisBaseService { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from yxt_base.base_supplier_info") - List selectListVo(); - @Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}") int updateBySidIsDelete(String sid); @Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'") List choiceSupplierInfo(String createOrgSid); - @Select("select * from yxt_base.base_supplier_info where sid = #{sid}") + @Select("select * from yxt_base.base_supplier_info where sid = #{sid} and isDelete = '0'") PmsSupplierInfo selBySid(String sid); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.xml index 5dce245bdc..104a7fb64c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.xml @@ -4,10 +4,8 @@ - - \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoQuery.java index fc217dd000..4e9e72c7ea 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoQuery.java @@ -50,6 +50,8 @@ public class PmsSupplierInfoQuery implements Query { @ApiModelProperty("供应商名称") private String supplierName; + @ApiModelProperty("编码") + private String supplierCode; @ApiModelProperty("供应商类型") private String supplierTypeName; @ApiModelProperty("电话") @@ -59,4 +61,9 @@ public class PmsSupplierInfoQuery implements Query { @ApiModelProperty("其他查询条件") private String otherQuery; + + private String orgPath; + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java index 0481f945fd..6bfdb1d02e 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java @@ -34,7 +34,10 @@ import com.yxt.pms.biz.pms.pmssupplierBank.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.pms.biz.pms.pmssuppliertype.PmsSupplierTypeVo; import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.pms.feign.privilege.PrivilegeQuery; +import com.yxt.pms.feign.sysuser.SysUserFeign; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierBankDto; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoDto; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoFeign; @@ -66,27 +69,69 @@ public class PmsSupplierInfoService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsSupplierInfoQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bsi.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } if (StringUtils.isNotBlank(query.getSupplierName())){ - qw.like("supplierName",query.getSupplierName()); + qw.like("bsi.supplierName",query.getSupplierName()); + } + if (StringUtils.isNotBlank(query.getSupplierCode())){ + qw.like("bsi.supplierCode",query.getSupplierCode()); } if (StringUtils.isNotBlank(query.getSupplierTypeName())){ - qw.like("supplierTypeName",query.getSupplierTypeName()); + qw.like("bsi.supplierTypeName",query.getSupplierTypeName()); } if (StringUtils.isNotBlank(query.getContactTelePhone())){ - qw.like("contactTelePhone",query.getContactTelePhone()); + qw.like("bsi.contactTelePhone",query.getContactTelePhone()); } if (StringUtils.isNotBlank(query.getContactName())){ - qw.like("contactName",query.getContactName()); + qw.like("bsi.contactName",query.getContactName()); } if (StringUtils.isNotBlank(query.getOtherQuery())){ - qw.and(wrapper -> wrapper.like("supplierName", query.getOtherQuery()).or().like("supplierPY", query.getOtherQuery()).or().like("contactTelePhone",query.getOtherQuery())); + qw.and(wrapper -> wrapper.like("bsi.supplierName", query.getOtherQuery()).or().like("bsi.supplierPY", query.getOtherQuery()).or().like("bsi.contactTelePhone",query.getOtherQuery())); } - qw.eq("isDelete",0); + qw.eq("bsi.isDelete",0); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); List records = pagging.getRecords(); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java index a1abe8085b..d2a9e97e72 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: yxt-base(供应商管理)
* File: BaseSupplierInfoVo.java
@@ -52,6 +54,8 @@ public class PmsSupplierInfoVo implements Vo { @ApiModelProperty("供应商名称") private String supplierName; + @ApiModelProperty("编码") + private String supplierCode; @ApiModelProperty("供应商类型") private String supplierTypeName; @ApiModelProperty("详细地址") @@ -62,6 +66,10 @@ public class PmsSupplierInfoVo implements Vo { private String contactName; @ApiModelProperty("手机") private String contactMobile; + @ApiModelProperty("开票类型value") + private String billingTypeValue; + @ApiModelProperty("税率") + private BigDecimal taxRate; @ApiModelProperty("省") private String province; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java index b44616e3d3..061498e5b4 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java @@ -51,9 +51,9 @@ public interface PmsSupplierTypeMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Delete("delete from yxt_base.base_supplier_type where sid = #{sid}") - void del(String sid); - - @Select("select * from yxt_base.base_supplier_type where useOrgSid = #{useOrgSid}") + @Select("select * from yxt_base.base_supplier_type where useOrgSid = #{useOrgSid} and isDelete = '0'") List selSupplierType(String useOrgSid); + + @Update("update yxt_base.base_supplier_type set isDelete = '1' where sid = #{sid}") + void updateIsDeleteBySid(String sid); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml index 3e1844de0f..c5c92c022f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.xml @@ -4,6 +4,8 @@ \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java index 1bc702c0f9..2da092174f 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeQuery.java @@ -54,4 +54,8 @@ public class PmsSupplierTypeQuery implements Query { private String supplierTypeCode; @ApiModelProperty("组织全路径") private String orgPath; + + private String userSid; + @ApiModelProperty("菜单url") + private String menuUrl; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java index ab4379ce8c..d8158e382e 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java @@ -36,6 +36,8 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.pms.feign.privilege.PrivilegeQuery; +import com.yxt.pms.feign.sysuser.SysUserFeign; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierTypeDto; import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierTypeFeign; import org.apache.commons.lang3.StringUtils; @@ -62,7 +64,7 @@ import java.util.List; public class PmsSupplierTypeService extends MybatisBaseService { @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; + private SysUserFeign sysUserFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; @Autowired @@ -71,14 +73,52 @@ public class PmsSupplierTypeService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsSupplierTypeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bst.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } if (StringUtils.isNotBlank(query.getSupplierTypeName())) { - qw.like("supplierTypeName", query.getSupplierTypeName()); + qw.like("bst.supplierTypeName", query.getSupplierTypeName()); } if (StringUtils.isNotBlank(query.getSupplierTypeCode())) { - qw.like("supplierTypeCode", query.getSupplierTypeCode()); + qw.like("bst.supplierTypeCode", query.getSupplierTypeCode()); } - qw.eq("createOrgSid", createOrgSid); + qw.eq("bst.isDelete",0); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -98,7 +138,7 @@ public class PmsSupplierTypeService extends MybatisBaseService selectPrivilegeLevel(@RequestBody PrivilegeQuery query); + + @ApiOperation("根据sid获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserVo.java new file mode 100644 index 0000000000..2d4f14051a --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/sysuser/SysUserVo.java @@ -0,0 +1,97 @@ +package com.yxt.pms.feign.sysuser; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserVo.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserVo
+ * Description: 用户表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象") +@Data +@NoArgsConstructor +public class SysUserVo implements Vo { + private static final long serialVersionUID = 2415131854581950721L; + @ApiModelProperty("部门sid") + private String departmentSid; + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("上级部门名称-本级部门名称 岗位名称") + @JsonProperty("pNameAndDepartmentNameAndPostName") + private String pNameAndDepartmentNameAndPostName; + @ApiModelProperty("岗位名称") + private String postName; + @ApiModelProperty("岗位Sid") + private String postSid; + @ApiModelProperty("单位sid") + private String organizationSid; + @ApiModelProperty("单位名称") + private String organizationName; + @ApiModelProperty("用户姓名") + private String name; + @ApiModelProperty("登录名，登录名不能相同") + private String userName; + + @ApiModelProperty("id") + private Integer id; + @ApiModelProperty("用户sid") + private String sid; + @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员") + private String isAdmin; + @ApiModelProperty("角色名称") + private String roleName; + + @ApiModelProperty("关联的人员sid") + private String staffSid; + + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty(value = "禁用状态") + private String isEnable; + + @ApiModelProperty("用户类型:1员工、2客户、3供应商") + private String userType; + @ApiModelProperty("用户类型:1、2、3") + private String userTypeKey; + @ApiModelProperty("用户头像") + private String headImage; + @ApiModelProperty("组织名称") + private String orgNamePath; + @ApiModelProperty("组织sid") + private String orgSidPath; + @ApiModelProperty(value = "token") + private String token; + @ApiModelProperty(value = "角色sids") + private List roleSids = new ArrayList<>(); + + private List orgList = new ArrayList<>(); + @ApiModelProperty("默认的组织机构sid全路径") + private String defaultOrgPath; + @ApiModelProperty("默认的组织机构名称全路径") + private String defaultOrgPathName; + + private String defaultDeptName; + private String defaultDeptSid; + + @ApiModelProperty("是否需要更换密码") + private Boolean needResetPsd; + @ApiModelProperty("工号") + private String jobNumber; +}