Browse Source

getDeptId 返回list

lyhzzz 3 years ago
parent
commit
c066101d77

+ 3 - 0
platform-common/src/main/java/com/platform/controller/AbstractController.java

@@ -34,4 +34,7 @@ public abstract class AbstractController {
         }
         }
         return lists;
         return lists;
     }
     }
+    protected  Long getCompanyId() {
+        return  getUser().getCompanyId();
+    }
 }
 }

+ 1 - 1
platform-shop/src/main/java/com/platform/controller/BrandController.java

@@ -305,7 +305,7 @@ public class BrandController extends AbstractController{
      */
      */
     @RequestMapping("/queryAll")
     @RequestMapping("/queryAll")
     public Result queryAll(@RequestBody Map<String, Object> params) {
     public Result queryAll(@RequestBody Map<String, Object> params) {
-        List<Long> roleIds = zhiHouseService.getCurrentUser().getRoleIdList();
+        List<Long> roleIds = getUser().getRoleIdList();
         if(!roleIds.contains(5) && !roleIds.contains(1)){
         if(!roleIds.contains(5) && !roleIds.contains(1)){
             //通过部门ID过滤数据
             //通过部门ID过滤数据
             if(null == getDeptId()){
             if(null == getDeptId()){

+ 1 - 1
platform-shop/src/main/java/com/platform/controller/SysUserController.java

@@ -41,7 +41,7 @@ public class SysUserController extends AbstractController {
     @PostMapping("/bindList")
     @PostMapping("/bindList")
     public Result userBindList(@RequestBody JSONObject param) {
     public Result userBindList(@RequestBody JSONObject param) {
         // 查询用户信息
         // 查询用户信息
-        JSONObject result = zhiHouseService.getSysUserListPageByDeptIdsAndUserName(getDeptId(),
+        JSONObject result = zhiHouseService.getSysUserListPageByDeptIdsAndUserName(getCompanyId(),
                 param.getLong("page"),param.getLong("limit"), param.getString("username"));
                 param.getLong("page"),param.getLong("limit"), param.getString("username"));
         List<Object> users = result.getJSONArray("list");
         List<Object> users = result.getJSONArray("list");
         if(!ObjectUtils.isEmpty(users)){
         if(!ObjectUtils.isEmpty(users)){

+ 1 - 1
platform-shop/src/main/java/com/platform/controller/TmLiveRoomController.java

@@ -187,7 +187,7 @@ public class TmLiveRoomController extends AbstractController{
         if(null == getUserId() || null == getDeptId()){
         if(null == getUserId() || null == getDeptId()){
             return Result.failure("缺失用户信息");
             return Result.failure("缺失用户信息");
         }
         }
-        resultPage  = liveRoomInfoService.getOrQuery(name, page , limit , getUserId() , getDeptId(),getUser());
+        resultPage  = liveRoomInfoService.getOrQuery(name, page , limit , getUserId() , getCompanyId(),getUser());
         if(resultPage != null){
         if(resultPage != null){
            return CommonDataUtils.toResponsObject(0,"" , CommonDataUtils.assembleResultCustom(resultPage.getTotal() , resultPage.getPages() ,
            return CommonDataUtils.toResponsObject(0,"" , CommonDataUtils.assembleResultCustom(resultPage.getTotal() , resultPage.getPages() ,
                     resultPage.getCurrent() ,limit , resultPage.getRecords()));
                     resultPage.getCurrent() ,limit , resultPage.getRecords()));