diff --git a/admin/src/main/java/com/hcy/admin/AdminApplication.java b/admin/src/main/java/com/hcy/admin/AdminApplication.java index c0443a2..3b5ec50 100644 --- a/admin/src/main/java/com/hcy/admin/AdminApplication.java +++ b/admin/src/main/java/com/hcy/admin/AdminApplication.java @@ -22,7 +22,7 @@ public class AdminApplication { public static void main(String[] args) { SpringApplication.run(AdminApplication.class, args); - System.out.println("(♥◠‿◠)ノ゙ AuditingBureau启动成功 ლ(´ڡ`ლ)゙"); + System.out.println("(♥◠‿◠)ノ゙ charging_pile启动成功 ლ(´ڡ`ლ)゙"); } } diff --git a/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java index 4c68aa2..c55777f 100644 --- a/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java @@ -149,6 +149,18 @@ public class WarehouseServiceImpl implements IWarehouseService { List modelList = warehouseMapper.selectList( new QueryWrapper() .in("id", ids)); + for (Long id : ids) { + Warehouse pModel = warehouseMapper.selectOne( + new QueryWrapper() + .select("id,pid,warehouse_name") + .eq("pid", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.isNull(pModel, "请先删除子级部门"); + } + + // GlobalConstant.NOT_DELETE 调用未删除常量 // GlobalConstant.DELETE 删除标识 diff --git a/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java b/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java index 56ad147..b534f54 100644 --- a/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java @@ -26,8 +26,6 @@ public class WarehouseParam implements Serializable { @NotNull(message = "id参数缺失", groups = {update.class, delete.class}) private Long id; - @NotNull(message = "pid参数缺失", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "pid参数值不能少于0", groups = {create.class, update.class}) private Long pid; @NotNull(message = "warehouseName参数缺失", groups = {create.class, update.class}) diff --git a/admin/target/classes/META-INF/spring-configuration-metadata.json b/admin/target/classes/META-INF/spring-configuration-metadata.json index a4da159..cf94d52 100644 --- a/admin/target/classes/META-INF/spring-configuration-metadata.json +++ b/admin/target/classes/META-INF/spring-configuration-metadata.json @@ -1,11 +1,5 @@ { - "groups": [ - { - "name": "wx.pay", - "type": "com.hcy.admin.config.wxpay.WxPayProperties", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" - } - ], + "groups": [], "properties": [ { "name": "like.production", @@ -16,23 +10,6 @@ "name": "like.upload-directory", "type": "java.lang.String", "description": "Description for like.upload-directory." - }, - { - "name": "wx.pay.description", - "type": "java.lang.String", - "description": "商品描述", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" - }, - { - "name": "wx.pay.order-notify-url", - "type": "java.lang.String", - "description": "订单支付后回调", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" - }, - { - "name": "wx.pay.order-refund-notify-url", - "type": "java.lang.String", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" } ], "hints": [] diff --git a/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-07-29_1.log.gz b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-07-29_1.log.gz new file mode 100644 index 0000000..8db00f2 Binary files /dev/null and b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-07-29_1.log.gz differ