1

src/main/java/com/fdkankan/manage_jp/common/ResultCode.java

@@ -40,6 +40,8 @@ public enum ResultCode  {
     GENERATE_OBJ_ERROR_TYPE(5022, "只能操作激光场景"),
     GENERATE_OBJ_ERROR(5023, "当前场景不支持 生成OBJ"),
 
+    SCENE_CONTRACTOR_ERROR3(5024, "场景协作失败，请填写公司管理员账号"),
+
 
     ;
 

src/main/java/com/fdkankan/manage_jp/controller/UserController.java

@@ -4,6 +4,7 @@ package com.fdkankan.manage_jp.controller;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.manage_jp.common.Result;
 import com.fdkankan.manage_jp.entity.User;
+import com.fdkankan.manage_jp.service.IUserRoleService;
 import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.LoginParam;
 import com.fdkankan.manage_jp.vo.request.UserListParam;
@@ -11,6 +12,12 @@ import com.fdkankan.manage_jp.vo.request.UserParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 用户信息表 前端控制器
@@ -25,6 +32,8 @@ public class UserController extends BaseController {
 
     @Autowired
     IUserService userService;
+    @Autowired
+    IUserRoleService userRoleService;
 
     /**
      * 登录
@@ -68,7 +77,19 @@ public class UserController extends BaseController {
 
     @PostMapping("/allUserList")
     public Result allUserList(@RequestBody User param){
-        return Result.success(userService.allList(param));
+
+        List<User> retrunList = new ArrayList<>();
+        List<User> list = userService.allList(param);
+        List<Long> userIds = list.stream().map(User::getId).collect(Collectors.toList());
+        HashMap<Long ,Long>  roleUserMap = userRoleService.getByUserList(userIds);
+        for (User user : list) {
+            Long roleId = roleUserMap.get(user.getId());
+            if(roleId != null && roleId!= 8){
+                retrunList.add(user);
+            }
+        }
+
+        return Result.success(retrunList);
     }
 }
 

src/main/java/com/fdkankan/manage_jp/service/IUserRoleService.java

@@ -4,6 +4,7 @@ import com.fdkankan.manage_jp.entity.User;
 import com.fdkankan.manage_jp.entity.UserRole;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -20,4 +21,6 @@ public interface IUserRoleService extends IService<UserRole> {
     List<UserRole> getByUserId(Long userId);
 
     Set<Long> getByUser(User user);
+
+    HashMap<Long, Long> getByUserList(List<Long> userIds);
 }

src/main/java/com/fdkankan/manage_jp/service/IUserService.java

@@ -40,5 +40,5 @@ public interface IUserService extends IService<User> {
 
     void logout(String token);
 
-    Object allList(User param);
+    List<User> allList(User param);
 }

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -127,9 +127,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             param.setUserId(user.getId());
             if(!roleIds.contains(6L)){
                 param.setIsDel(false);
+                param.setIsMain(false);
             }
         }
         List<String> numList = tmContractorNumService.getNumListByCompanyId(user.getCompanyId());
+        param.setCooperateSceneCodes(numList);
         Page<SceneVo> page  = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
         List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
@@ -162,6 +164,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setIsUpgrade(0);
             }
             record.setIsDel(param.getIsDel());
+            record.setIsMain(param.getIsMain());
             if(numList != null && numList.contains(record.getNum())){
                 record.setIsMain(false);
                 record.setIsDel(false);

src/main/java/com/fdkankan/manage_jp/service/impl/TmColdStorageServiceImpl.java

@@ -165,7 +165,7 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
                 throw new BusinessException(ResultCode.SCENE_NO_COLD_STORAGE);
             }
             User user = userService.getByUserName(param.getUserName());
-            if(user == null){
+            if(user == null || user.getCompanyId() == null){
                 throw new BusinessException(ResultCode.USER_NOT_EXIST);
             }
             ScenePlus scenePlus = scenePlusService.getByNum(num);

src/main/java/com/fdkankan/manage_jp/service/impl/TmContractorServiceImpl.java

@@ -73,9 +73,17 @@ public class TmContractorServiceImpl extends ServiceImpl<ITmContractorMapper, Tm
             }
 
             User contractorUser = userService.getByUserName(param.getUserName());
-            if(contractorUser == null){
+            if(contractorUser == null || contractorUser.getCompanyId() == null){
                 throw new BusinessException(ResultCode.CONTRACTOR_USER_ERROR);
             }
+            User contractorMain = userService.getById(contractorUser.getCompanyId());
+            if(contractorMain == null ){
+                throw new BusinessException(ResultCode.CONTRACTOR_USER_ERROR);
+            }
+            if(!contractorUser.getId().equals(contractorMain.getId())){
+                throw new BusinessException(ResultCode.SCENE_CONTRACTOR_ERROR3);
+            }
+
             if(mainContractorUser.getId().equals(contractorUser.getId()) || mainContractorUser.getCompanyId().equals(contractorUser.getCompanyId())){
                 throw new BusinessException(ResultCode.SCENE_CONTRACTOR_ERROR2);
             }

src/main/java/com/fdkankan/manage_jp/service/impl/UserRoleServiceImpl.java

@@ -11,6 +11,7 @@ import com.fdkankan.manage_jp.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -42,4 +43,17 @@ public class UserRoleServiceImpl extends ServiceImpl<IUserRoleMapper, UserRole>
         List<UserRole> userRoles = this.getByUserId(user.getId());
         return userRoles.stream().map(UserRole::getRoleId).collect(Collectors.toSet());
     }
+
+    @Override
+    public HashMap<Long, Long> getByUserList(List<Long> userIds) {
+        HashMap<Long,Long> map = new HashMap<>();
+        if(userIds == null || userIds.isEmpty()){
+            return map;
+        }
+        LambdaQueryWrapper<UserRole> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(UserRole::getUserId,userIds);
+        List<UserRole> list = this.list(wrapper);
+        list.forEach(e->map.put(e.getUserId(),e.getRoleId()));
+        return map;
+    }
 }

src/main/java/com/fdkankan/manage_jp/service/impl/UserServiceImpl.java

@@ -218,7 +218,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public Object allList(User param) {
+    public List<User> allList(User param) {
         if(StringUtils.isNotBlank(param.getUserName())){
             LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
             wrapper.like(User::getUserName,param.getUserName());

src/main/java/com/fdkankan/manage_jp/vo/request/SceneParam.java

@@ -27,6 +27,7 @@ public class SceneParam extends RequestBase {
     private Integer status;
     private Integer neStatus;
     private Boolean isDel = true;
+    private Boolean isMain = true;
 
     private Integer id;
 }