【admin】优化# 1、仓库管理删除功能

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启动成功   ლ(´ڡ`ლ)ﾞ");
     }
 
 }

admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java

@@ -149,6 +149,18 @@ public class WarehouseServiceImpl implements IWarehouseService {
         List<Warehouse> modelList = warehouseMapper.selectList(
                 new QueryWrapper<Warehouse>()
                         .in("id", ids));
+        for (Long id : ids) {
+            Warehouse pModel = warehouseMapper.selectOne(
+                    new QueryWrapper<Warehouse>()
+                            .select("id,pid,warehouse_name")
+                            .eq("pid", id)
+                            .eq("is_delete", 0)
+                            .last("limit 1"));
+
+            Assert.isNull(pModel, "请先删除子级部门");
+        }
+
+
         // GlobalConstant.NOT_DELETE 调用未删除常量
         // GlobalConstant.DELETE 删除标识
 

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})

admin/target/classes/META-INF/spring-configuration-metadata.json

@@ -1,11 +1,5 @@
 {
-  "groups": [
+  "groups": [],
-    {
-      "name": "wx.pay",
-      "type": "com.hcy.admin.config.wxpay.WxPayProperties",
-      "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties"
-    }
-  ],
   "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": []