fix(日志条数错误bug修改): 日志条数错误bug修改

日志条数错误bug修改

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/AppFunAuthResultServiceImpl.java

@@ -110,6 +110,7 @@ public class AppFunAuthResultServiceImpl implements IAppFunAuthResultService {
             authResult.setAuthStatus(authStatus);
             authResult.setStartTime(startTime);
             authResult.setEndTime(endTime);
+            authResult.setDeleted(BooleanEnum.FALSE.value);
             addResult.add(authResult);
         }
         if(addResult.size() >0) {

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/DataAuthServiceImpl.java

@@ -240,6 +240,9 @@ public class DataAuthServiceImpl implements IDataAuthService {
     }
 
     private void addDataAuthList(Date date, String subId, String subType, String authType, String userId, List<SubDataDTO> addList) {
+        if(CollectionUtils.isEmpty(addList)) {
+            return ;
+        }
         try {
             for (SubDataDTO dto : addList) {
                 DataAuth dataAuth = new DataAuth();
@@ -264,6 +267,9 @@ public class DataAuthServiceImpl implements IDataAuthService {
     }
 
     private void delDataAuthList(Date date, String userId, List<DataAuth> delList) {
+        if(CollectionUtils.isEmpty(delList)) {
+            return ;
+        }
         try {
             for (DataAuth dataAuth : delList) {
                 dataAuth.setDeleteUser(userId);

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/StaffAssignAuthInfoService.java

@@ -955,6 +955,10 @@ public class StaffAssignAuthInfoService implements IStaffAssignAuthInfoService {
         }
         //2、保存用户角色授权
         List<StaffAssignAuthInfo> oldUserRoles = this.findByPropertyValue("staffId", dto.getUserId());//已授权角色
+        List<StaffAssignAuthInfo> logUserRoles = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(oldUserRoles)) {
+            logUserRoles.addAll(oldUserRoles);
+        }
         try {
             for (int i = 0; i < saveList.size(); i++) {
                 JSONObject jsonObject = (JSONObject) saveList.get(i);
@@ -1008,11 +1012,11 @@ public class StaffAssignAuthInfoService implements IStaffAssignAuthInfoService {
                 sendMessage(staffList, appId);
             }
 
-            logInfoFillService.sendUserViewAuthLog(AuthResultEnum.SUC, dto,oldUserRoles, RequestIpUtil.getRealIp());
+            logInfoFillService.sendUserViewAuthLog(AuthResultEnum.SUC, dto,logUserRoles, RequestIpUtil.getRealIp());
 
         } catch (Exception e) {
             logger.info("保存异常=====", e);
-            logInfoFillService.sendUserViewAuthLog(AuthResultEnum.FAIL, dto, oldUserRoles, RequestIpUtil.getRealIp());
+            logInfoFillService.sendUserViewAuthLog(AuthResultEnum.FAIL, dto, logUserRoles, RequestIpUtil.getRealIp());
             return ResponseStatus.success("保存异常，请稍后重试！");
         }
         return ResponseStatus.success("保存成功！");