소스 검색

更新!

TRX 1 년 전
부모
커밋
15c415539f

+ 3 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DeviceUseRecordController.java

@@ -51,7 +51,9 @@ public class DeviceUseRecordController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "设备使用记录列表-分页查询", description = "设备使用记录列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<DeviceUseRecordModel>> page(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, @Parameter(required = false) DeviceUseRecordSearch param) {
+    public ResultContent<Page<DeviceUseRecordModel>> page(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) DeviceUseRecordSearch param) {
         Assert.hasText(param.getProjectOid(), "projectOid不能为空");
         return deviceUseRecordService.page(param, pageable);
     }

+ 2 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/DevicePermissIotService.java

@@ -24,7 +24,6 @@ import com.zhongshu.card.server.core.domain.school.CardInfo;
 import com.zhongshu.card.server.core.service.projectAbout.CardInfoServiceImpl;
 import com.zhongshu.card.server.core.service.projectAbout.OrgUserFaceService;
 import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
-import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -254,6 +253,7 @@ public class DevicePermissIotService {
                 } else {
                     permiss = new ProjectUserPermiss();
                 }
+                permiss.setMark(2);
                 permiss.setUid(userId);
                 UserAccount userAccount = userMap.get(userId);
                 if (ObjectUtils.isNotEmpty(userAccount)) {
@@ -270,7 +270,7 @@ public class DevicePermissIotService {
                 if (ObjectUtils.isNotEmpty(cardInfoList)) {
                     permiss.setCNos(cardInfoList.stream().map(it -> it.getCode()).collect(Collectors.toList()));
                 } else {
-                    permiss.setCNos(List.of("unKnow"));
+//                    permiss.setCNos(List.of("unKnow"));
                 }
                 map.put(userId, permiss);
             }