更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/school/Area.java

@@ -27,7 +27,7 @@ public class Area extends SuperMain {
     private String name;
 
     @Schema(description = "区域编码")
-    private String code;
+    private String code = "";
 
     @Schema(description = "区域状态")
     private DataState state = DataState.Enable;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.school.AreaModel;
+import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
@@ -138,6 +139,7 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
             if (ObjectUtils.isEmpty(organization)) {
                 return ResultContent.buildFail("projectOid不存在");
             }
+            //TODO 放开查询所有的设备
 //            param.setProjectInfoCode(organization.getCode());
         }
         Page<DeviceInfo> page = deviceInfoDao.page(pageable, param);
@@ -304,11 +306,12 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
             model.setProjectInfoName(organizationServiceImpl.getOrgNameByCode(entity.getProjectInfoCode()));
 
             // 所属区域信息
-            List<AreaModel> areaModel = areaService.getParents(entity.getArea());
-            if (ObjectUtils.isNotEmpty(areaModel)) {
-                model.setArea(areaModel.get(0));
-                Collections.reverse(areaModel);
-                model.setAreaAllName(String.format("/", areaModel.stream().map(it -> it.getName()).collect(Collectors.toList())));
+            List<AreaSimpleModel> areaModels = areaService.getParents(entity.getArea());
+            if (ObjectUtils.isNotEmpty(areaModels)) {
+                model.setArea(areaModels.get(0));
+                Collections.reverse(areaModels);
+                List<String> areaNames = areaModels.stream().map(it -> it.getName()).collect(Collectors.toList());
+                model.setAreaAllName(String.join("/", areaNames));
             }
         }
         return model;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissEventService.java

@@ -120,4 +120,9 @@ public class DevicePermissEventService {
         });
     }
 
+    public void send() {
+
+
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissService.java

@@ -108,6 +108,10 @@ public class DevicePermissService extends SuperService {
         }
         // 设备数据
         List<DeviceInfo> deviceInfos = deviceInfoDao.findByDeviceIdIn(param.getDeviceIds());
+        if (ObjectUtils.isEmpty(deviceInfos)) {
+            return ResultContent.buildFail("未找到设备信息");
+        }
+
         if (ObjectUtils.isNotEmpty(deviceInfos)) {
             // 机构用户数据
             List<OrganizationUser> orgUsers = organizationUserDao.findByIdIn(ids);
@@ -149,7 +153,6 @@ public class DevicePermissService extends SuperService {
             permiss.setDeviceType(deviceInfo.getDeviceType());
             permiss.setArea(deviceInfo.getArea());
             permiss.setAreaPaths(deviceInfo.getAreaPaths());
-            permiss.setProjectOid(deviceInfo.getProjectOid());
         }
     }
 
@@ -168,6 +171,7 @@ public class DevicePermissService extends SuperService {
             permiss.setUserOid(organizationUser.getOid());
             permiss.setCode(organizationUser.getCode());
             permiss.setAuthType(organizationUser.getAuthType());
+            permiss.setProjectOid(organizationUser.getProjectOid());
         }
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/AreaServiceImpl.java

@@ -5,6 +5,7 @@ import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.org.OidAboutInfo;
 import com.zhongshu.card.client.model.school.AreaModel;
 import com.zhongshu.card.client.model.school.AreaParam;
+import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.model.school.DictInfoParam;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
@@ -179,14 +180,14 @@ public class AreaServiceImpl extends SuperService implements AreaService {
      * @param id
      * @return
      */
-    public List<AreaModel> getParents(String id) {
+    public List<AreaSimpleModel> getParents(String id) {
         List<Area> list = new ArrayList<>();
         loopLoad(id, list);
-        List<AreaModel> models = list.stream().map(this::toModel).collect(Collectors.toList());
+        List<AreaSimpleModel> models = list.stream().map(this::toSimpleModel).collect(Collectors.toList());
         return models;
     }
 
-    public List<AreaModel> getParents(Area area) {
+    public List<AreaSimpleModel> getParents(Area area) {
         if (ObjectUtils.isNotEmpty(area)) {
             return getParents(area.getId());
         }
@@ -234,4 +235,14 @@ public class AreaServiceImpl extends SuperService implements AreaService {
         }
         return model;
     }
+
+    public AreaSimpleModel toSimpleModel(Area entity) {
+        AreaSimpleModel model = null;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            model = new AreaSimpleModel();
+            BeanUtils.copyProperties(entity, model);
+        }
+        return model;
+    }
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -183,7 +183,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
                 return null;
             }
             OrganizationUserModel organizationUser = new OrganizationUserModel();
-            organizationUser.setUser(toModel(userAccount));
+            organizationUser.setUser(toSimpleModel(userAccount));
             return organizationUser;
         }
         return null;
@@ -574,7 +574,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             model.setOrganization(miniModel);
 
             // 用户信息
-            UserCountModel userCountModel = toModel(entity.getUser());
+            UserCountSimpleModel userCountModel = toSimpleModel(entity.getUser());
             model.setUser(userCountModel);
 
             // 职务 职位