diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java index ff79f32..421e0ba 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java @@ -88,4 +88,9 @@ public class SupplierTypeRest { public ResultBean> selSupplierType(@RequestParam("orgPath") String orgPath){ return supplierTypeService.selSupplierType(orgPath); } + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkSaveCode/{supplierTypeCode}/{useOrgSid}") + public ResultBean checkSaveCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid){ + return supplierTypeService.checkSaveCode(supplierTypeCode,useOrgSid); + } } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoQuery.java index 8fd0ba2..dc06325 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoQuery.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoQuery.java @@ -59,4 +59,12 @@ public class SupplierInfoQuery implements Query { @ApiModelProperty("其他查询条件") private String otherQuery; + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java index e77f842..4470d2c 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java @@ -29,6 +29,9 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeQuery; +import com.yxt.wms.biz.func.commonmethod.CommonMethod; +import com.yxt.wms.biz.func.commonmethod.DataRule; import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign; import com.yxt.wms.feign.supplier.supplierinfo.SupplierInfoFeign; import org.springframework.beans.factory.annotation.Autowired; @@ -60,9 +63,13 @@ public class SupplierInfoService extends MybatisBaseService> listPageVo(PagerQuery pq) { SupplierInfoQuery query = pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); return baseSupplierInfoFeign.listPage(pq); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeQuery.java index 5381bd4..ba140d0 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeQuery.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeQuery.java @@ -58,5 +58,13 @@ public class SupplierTypeQuery implements Query { private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeService.java b/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeService.java index fb2ab7d..4c0b8c5 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeService.java @@ -32,6 +32,9 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeQuery; +import com.yxt.wms.biz.func.commonmethod.CommonMethod; +import com.yxt.wms.biz.func.commonmethod.DataRule; import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; @@ -71,9 +74,13 @@ public class SupplierTypeService extends MybatisBaseService> listPageVo(PagerQuery pq) { - + SupplierTypeQuery query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); return supplierTypeFeign.listPage(pq); } @@ -146,4 +153,7 @@ public class SupplierTypeService extends MybatisBaseService checkSaveCode(String supplierTypeCode, String orgSid){ + return supplierTypeFeign.checkSaveCode(supplierTypeCode,orgSid); + } } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenu.java b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenu.java index 8982dda..037686d 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenu.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenu.java @@ -61,4 +61,5 @@ public class SysMenu extends BaseEntity { @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") private String menuType; + private String cid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuDto.java b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuDto.java index 547b355..f0d40d2 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuDto.java @@ -69,4 +69,5 @@ public class SysMenuDto implements Dto { @ApiModelProperty(value = "备注") private String remarks; + private String cid; } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java index e6e1111..c49952d 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java @@ -58,4 +58,6 @@ public class SysMenuTreeVo implements Vo { private List children; private String menuType; private String isShow; + private String menuTypeValue; + private String cid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java index 39dfd29..5f79547 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuVo.java @@ -71,5 +71,5 @@ public class SysMenuVo implements Vo { private String checked; @ApiModelProperty("资源名称") private String sourceName; - + private String cid; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleVo.java b/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleVo.java index 52239c7..8e4c57a 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleVo.java @@ -46,4 +46,5 @@ public class SysRoleVo implements Vo { private String roleTypeValue; private String dataRuleId; private String dataRuleValue; + private String orgSid; }