企有

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

@@ -140,8 +140,10 @@ public class CompanyController {
         BeanUtils.copyProperties(companyEntity,responseCompany);
         if(!ObjectUtils.isEmpty(companyEntity.getManagerId())){
             User userEntity = userService.getById(companyEntity.getManagerId());
-            responseCompany.setManagerName(userEntity.getUserName());
-            responseCompany.setManagerPhone(userEntity.getUserName());
+            if(userEntity != null){
+                responseCompany.setManagerName(userEntity.getUserName());
+                responseCompany.setManagerPhone(userEntity.getUserName());
+            }
         }
 
         return Result.success(responseCompany);

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

@@ -92,10 +92,9 @@ public class LaserController extends BaseController{
         sceneParam.setPageNum(1);
         sceneParam.setPageSize(99999);
         sceneParam.setType(10);
-        if(!roleIds.contains(5L) && roleIds.contains(6L)){
-           sceneParam.setCompanyId(user.getCompanyId());
-        }
-        if(!roleIds.contains(6L)){
+        sceneParam.setCompanyId(user.getCompanyId());
+
+        if(!roleIds.contains(6L) && roleIds.contains(5L)){
             sceneParam.setUserId(user.getId());
         }
         Page<SceneVo> page = sceneProMapper.pageList(new Page<>(sceneParam.getPageNum(),sceneParam.getPageSize()),sceneParam);