From b70bbce994e573e58d4ee79a53ea60e9338b2516 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 10:18:37 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index 1ff3b10..980aa3e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -1,43 +1,39 @@
 package com.doumee.service.business.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.erp.model.openapi.request.RoleListRequest;
-import com.doumee.core.erp.model.openapi.response.DeviceListResponse;
-import com.doumee.core.erp.model.openapi.response.RoleListResponse;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.*;
 import com.doumee.dao.business.join.MemberRoleJoinMapper;
-import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.DeviceRole;
+import com.doumee.dao.business.model.Empower;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRole;
 import com.doumee.dao.web.response.DeviceRoleVO;
 import com.doumee.service.business.DeviceRoleService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.MemberService;
 import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
-
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 闂ㄧ瑙掕壊淇℃伅琛⊿ervice瀹炵幇
@@ -78,6 +74,9 @@
             newDeviceRole = getDeviceRole(deviceRole.getType());
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo ==null){
+            loginUserInfo = deviceRole.getLoginUserInfo();
+        }
         if(null != newDeviceRole && deviceRole.getIsDefault().equals(Constants.ZERO)) {
             DeviceRole updateDeviceRole = new DeviceRole();
             // 鑻ョ幇鍦ㄦ柊澧炴暟鎹缃粯璁ら棬绂佺粍锛涢偅涔堝厛鎶婁箣鍓嶇殑榛樿闂ㄧ缁勭姸鎬佹敼涓轰笉鏄粯璁ょ殑
@@ -140,6 +139,9 @@
             newDeviceRole = getDeviceRole(deviceRole.getType());
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo ==null){
+            loginUserInfo = deviceRole.getLoginUserInfo();
+        }
         if(null != newDeviceRole  && deviceRole.getIsDefault().equals(Constants.ZERO)) {
             DeviceRole update = new DeviceRole();
             update.setEdirot(loginUserInfo.getId().toString());
@@ -309,6 +311,9 @@
             newDeviceRole = getDeviceRole(deviceRole.getType());
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo ==null){
+            loginUserInfo = deviceRole.getLoginUserInfo();
+        }
         List<DeviceRole> deviceRoleList = new ArrayList<>();
         if(null != newDeviceRole) {
             DeviceRole update = new DeviceRole();

--
Gitblit v1.9.3