回收站资料节点查询和删除人和恢复人查询

blade-service/blade-business/src/main/java/org/springblade/business/controller/RecycleBinController.java

@@ -240,7 +240,7 @@ public class RecycleBinController extends BladeController {
             if (!recycleBinInfoList.isEmpty() && regainNode) {
                 List<Long> recycleBinIds = recycleBinInfoList.stream().map(RecycleBinInfo::getId).collect(Collectors.toList());
                 this.recycleBinInfoService.update(Wrappers.<RecycleBinInfo>lambdaUpdate().set(RecycleBinInfo::getStatus, 1).set(RecycleBinInfo::getUpdateTime, new Date())
-                        .set(RecycleBinInfo::getUpdateUser, AuthUtil.getUserId()).set(RecycleBinInfo::getUpdateUserName, AuthUtil.getUserName()).in(RecycleBinInfo::getId, recycleBinIds));
+                        .set(RecycleBinInfo::getUpdateUser, AuthUtil.getUserId()).set(RecycleBinInfo::getUpdateUserName, AuthUtil.getNickName()).in(RecycleBinInfo::getId, recycleBinIds));
                 Set<Long> set = recycleBinInfoList.stream().map(RecycleBinInfo::getContractId).collect(Collectors.toSet());
                 for (Long l : set) {
                     bladeRedis.del("blade:recycle:user:cache:" + l, "blade:recycle:user:cache:" + l + "_1");

blade-service/blade-business/src/main/java/org/springblade/business/mapper/RecycleBinInfoMapper.xml

@@ -26,10 +26,11 @@
         <result column="del_root_name" property="delRootName"/>
         <result column="operation_id" property="operationId"/>
         <result column="jl_file_name" property="jlFileName"/>
+        <result column="is_data" property="isData"/>
     </resultMap>
 
     <sql id="includeSql" >
-        id, create_user, create_dept, create_time, update_user, update_time, status, is_deleted, project_id, contract_id, del_type, file_name, position, business_id, operation_time, create_user_name, update_user_name, del_id, del_root_id, del_root_name, operation_id, jl_file_name
+        id, create_user, create_dept, create_time, update_user, update_time, status, is_deleted, project_id, contract_id, del_type, file_name, position, business_id, operation_time, create_user_name, update_user_name, del_id, del_root_id, del_root_name, operation_id, jl_file_name, is_data
     </sql>
     <select id="page" resultMap="recycleBinResultMap">
         select

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/RecycleBinInfoServiceImpl.java

@@ -178,7 +178,7 @@ public class RecycleBinInfoServiceImpl extends BaseServiceImpl<RecycleBinInfoMap
             info.setProjectId(Long.parseLong(contract.getProjectId()));
             info.setOperationId(operationId + "");
             info.setDelType(2);
-            info.setCreateUserName(AuthUtil.getUserName());
+            info.setCreateUserName(AuthUtil.getNickName());
             info.setCreateUser(AuthUtil.getUserId());
             info.setOperationTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
             info.setDelId(contract.getPKeyId());

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialSelfInspectionRecordServiceImpl.java

@@ -2285,7 +2285,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
             List<Long> collect = trialSampleInfoList.stream().map(TrialSampleInfo::getId).collect(Collectors.toList());
             recordDTO.setSampleIds(org.apache.commons.lang.StringUtils.join(collect, ","));
             recordDTO.setNodeId(dto.getNodeId());
-            recordDTO.setTrialUserName(AuthUtil.getUserName());
+            recordDTO.setTrialUserName(AuthUtil.getNickName());
             this.trialDeviceUseService.addDeviceUseInfo(recordDTO, record.getId());
         }
             if(dto.getOldRecordNumber()!=null&&dto.getOldRecordNumber().equals(dto.getRecordNo())){