7/19

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java

@@ -88,4 +88,9 @@ public class SupplierTypeRest {
 	public ResultBean<List<SupplierTypeDown>> selSupplierType(@RequestParam("orgPath") String orgPath){
 		return supplierTypeService.selSupplierType(orgPath);
 	}
+	@ApiOperation("根据SID获取一条记录")
+	@GetMapping("/checkSaveCode/{supplierTypeCode}/{useOrgSid}")
+	public ResultBean<Integer> checkSaveCode(@PathVariable("supplierTypeCode") String supplierTypeCode,@PathVariable("useOrgSid") String useOrgSid){
+		return supplierTypeService.checkSaveCode(supplierTypeCode,useOrgSid);
+	}
 }

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;
 }

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<SupplierInfoMapper,
 //	private BaseSupplierBankService baseSupplierBankService;
 	@Autowired
 	SupplierInfoFeign baseSupplierInfoFeign;
-
+	@Autowired
+	CommonMethod commonMethod;
 	public ResultBean<PagerVo<SupplierInfoVo>> listPageVo(PagerQuery<SupplierInfoQuery> 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);
 	}
 	

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;
 
 }

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<SupplierTypeMapper,
 	SysStaffOrgFeign sysStaffOrgFeign;
 	@Autowired
 	SysUserFeign sysUserFeign;
-
+	@Autowired
+	CommonMethod commonMethod;
 	public ResultBean<PagerVo<SupplierTypeVo>> listPageVo(PagerQuery<SupplierTypeQuery> 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<SupplierTypeMapper,
 		}
 		return supplierTypeFeign.selSupplierType(useOrgSid);
 	}
+	public ResultBean<Integer> checkSaveCode(String supplierTypeCode, String orgSid){
+		return supplierTypeFeign.checkSaveCode(supplierTypeCode,orgSid);
+	}
 }

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;
 }

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;
 }

wms/src/main/java/com/yxt/wms/biz/func/sysmenu/SysMenuTreeVo.java

@@ -58,4 +58,6 @@ public class SysMenuTreeVo implements Vo {
     private List<SysMenuTreeVo> children;
     private String menuType;
     private String isShow;
+    private String menuTypeValue;
+    private String cid;
 }

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;
 }

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;
 }