7/18

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

@@ -51,9 +51,9 @@ public class SysRoleRest {
 
 
 	@ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
-	@PostMapping("/listAllByUserSid/{userSid}")
-	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid){
-		return sysRoleService.listAllByUserSid(userSid);
+	@PostMapping("/listAllByUserSid/{userSid}/{orgSid}")
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid){
+		return sysRoleService.listAllByUserSid(userSid,orgSid);
 	}
 
 

wms/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoDto.java

@@ -24,4 +24,6 @@ public class BaseBrandInfoDto implements Dto {
     private String letter;//品牌的首字母大写
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuDto.java

@@ -43,5 +43,7 @@ public class BaseGoodsSpuDto implements Dto {
     private String createOrgSid;//创建组织sid
     private BaseGoodsSpuDetailDto baseGoodsSpuDetail;//商品spu详情
     private List<BaseGoodsSkuDto> baseGoodsSkus;//商品sku
+    private String userSid;
+    private String orgPath;
 
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeDto.java

@@ -31,5 +31,7 @@ public class BaseGoodsTypeDto implements Dto {
     private String pName;//创建组织sid
     private String sids;//父级sid
     private String outStockRule;//出库规则
+    private String userSid;
+    private String orgPath;
 
 }

wms/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java

@@ -24,4 +24,6 @@ public class BaseGoodsUnitDto implements Dto {
     private String state;
     private String isDelete;
     private String unitName;//单位名称
+    private String userSid;
+    private String orgPath;
 }

wms/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerDto.java

@@ -32,4 +32,6 @@ public class BaseManufacturerDto implements Dto {
     private String sortNo;//排序
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }

wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleQuery.java

@@ -35,4 +35,6 @@ public class SysRoleQuery implements Query {
     
 	@ApiModelProperty("1、系统管理员、2、普通角色")
     private Integer type;
+    private String orgSid;//组织
+    private String sourceSid;//资源
 }

wms/src/main/java/com/yxt/wms/biz/func/sysrole/SysRoleService.java

@@ -92,8 +92,8 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
         return sysRoleFeign.fetchByUserSid(userSid);
     }
 
-    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
-        return sysRoleFeign.listAllByUserSid(userSid);
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid,String orgSid) {
+        return sysRoleFeign.listAllByUserSid(userSid, orgSid);
     }
 
     /**

wms/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java

@@ -65,7 +65,7 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
                 useOrgSid = sysOrganization.getSid();
             }
         }
-        return warehouseAreaFeign.listAll();
+        return warehouseAreaFeign.listAll(query);
     }
 
     public ResultBean<String> saveOrUpdate(WarehouseAreaDto dto) {

wms/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java

@@ -68,7 +68,7 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
                 useOrgSid = sysOrganization.getSid();
             }
         }
-        return warehouseAreaTypeFeign.listAll(useOrgSid);
+        return warehouseAreaTypeFeign.listAll(query);
     }
 
     public ResultBean<String> saveOrUpdate(WarehouseAreaTypeDto dto) {

wms/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java

@@ -66,7 +66,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
                 useOrgSid = sysOrganization.getSid();
             }
         }
-        List<WarehouseInfo> list = WarehouseFeign.listAll(useOrgSid).getData();
+        List<WarehouseInfo> list = WarehouseFeign.listAll(query).getData();
         return rb.success().setData(list);
     }
 

wms/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeign.java

@@ -43,8 +43,8 @@ public interface SysRoleFeign {
     @PostMapping("/listAll")
     public ResultBean<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query);
     @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
-    @PostMapping("/listAllByUserSid/{userSid}")
-    public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid);
+    @PostMapping("/listAllByUserSid/{userSid}/{orgSid}")
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid);
 
     @ApiOperation("根据用户sid查询用户的角色列表")
     @PostMapping("/fetchByUserSid/{userSid}")

wms/src/main/java/com/yxt/wms/feign/portal/sysrole/SysRoleFeignFallback.java

@@ -37,7 +37,7 @@ public class SysRoleFeignFallback implements SysRoleFeign {
 	}
 
 	@Override
-	public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid, String orgSid) {
 		return null;
 	}
 

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java

@@ -6,6 +6,7 @@ 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.warehousearea.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -37,8 +38,8 @@ public interface WarehouseAreaFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WarehouseAreaVo>> listPage(@RequestBody PagerQuery<WarehouseAreaQuery> query);
     @ApiOperation("查询所有的库区")
-    @GetMapping("/listAll")
-    public ResultBean<List<WarehouseArea>> listAll();
+    @PostMapping("/listAll")
+    public ResultBean<List<WarehouseArea>> listAll(@RequestBody OrgPathQuery query);
 
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")

wms/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeignFallback.java

@@ -6,6 +6,7 @@ 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.warehousearea.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -33,10 +34,11 @@ public class WarehouseAreaFeignFallback implements WarehouseAreaFeign {
 	}
 
 	@Override
-	public ResultBean<List<WarehouseArea>> listAll() {
+	public ResultBean<List<WarehouseArea>> listAll(OrgPathQuery query) {
 		return null;
 	}
 
+
 	@Override
 	public ResultBean<String> saveOrUpdate(WarehouseAreaDto dto) {
 		return null;

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java

@@ -9,6 +9,7 @@ import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaType;
 import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaTypeDto;
 import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaTypeQuery;
 import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaTypeVo;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -40,8 +41,8 @@ public interface WarehouseAreaTypeFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WarehouseAreaTypeQuery> pq);
     @ApiOperation("查询所有的")
-    @GetMapping("/listAll/{useOrgSid}")
-    public ResultBean<List<WarehouseAreaType>> listAll(@PathVariable("useOrgSid")String useOrgSid);
+    @PostMapping("/listAll")
+    public ResultBean<List<WarehouseAreaType>> listAll(@RequestBody OrgPathQuery query);
 
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeignFallback.java

@@ -9,6 +9,7 @@ import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaType;
 import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaTypeDto;
 import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaTypeQuery;
 import com.yxt.wms.biz.func.warehouseareatype.WarehouseAreaTypeVo;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -35,7 +36,7 @@ public class WarehouseAreaTypeFeignFallback implements WarehouseAreaTypeFeign {
 	}
 
 	@Override
-	public ResultBean<List<WarehouseAreaType>> listAll(String useOrgSid) {
+	public ResultBean<List<WarehouseAreaType>> listAll(OrgPathQuery query) {
 		return null;
 	}
 

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java

@@ -6,6 +6,7 @@ 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.warehouseinfo.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -37,8 +38,8 @@ public interface WarehouseFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq);
     @ApiOperation("查询所有的仓库")
-    @GetMapping("/listAll/{useOrgSid}")
-    public ResultBean<List<WarehouseInfo>> listAll(@PathVariable("useOrgSid") String useOrgSid);
+    @PostMapping("/listAll")
+    public ResultBean<List<WarehouseInfo>> listAll(@RequestBody OrgPathQuery query);
 
 
     @ApiOperation("保存修改")

wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java

@@ -6,6 +6,7 @@ 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.warehouseinfo.*;
+import com.yxt.wms.utils.OrgPathQuery;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -33,7 +34,7 @@ public class WarehouseFeignFallback implements WarehouseFeign {
 	}
 
 	@Override
-	public ResultBean<List<WarehouseInfo>> listAll(String useOrgSid) {
+	public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {
 		return null;
 	}