修改用户登录,权限分配等

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -112,7 +112,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         Rest<RespData<List<SkinBasePdu>>> resp = skinBaseFeign.list(new SkinBasePdu());
         log.info("skinBaseFeignResp:{}",JSON.toJSONString(resp));
         if (resp.getCode() == YesNoEnum.YES.getValue()) {
-            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
+            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution()==null?"":a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
             this.addDict(model, "skinProductCodeMap", skinProductCodeMap);
         }
         super.init(model, context);

device-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java

@@ -45,7 +45,7 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product
         //获取所有产品皮肤 分组显示
         Rest<RespData<List<SkinBasePdu>>> resp = skinBaseFeign.list(new SkinBasePdu());
         if (resp.getCode() == YesNoEnum.YES.getValue()) {
-            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
+            Map<String, Map<String, String>> skinProductCodeMap = resp.getData().getData().stream().collect(Collectors.groupingBy(x -> x.getProductCode(), Collectors.toMap(a -> a.getImageResolution()==null?"":a.getImageResolution(), b -> b.getImageResolutionValue(),(o,n)->n)));
             this.addDict(model, "skinProductCodeMap", skinProductCodeMap);
         }