店铺列表新增排序字段

src/main/java/com/cdf/common/ResultCode.java

@@ -18,7 +18,8 @@ public enum ResultCode {
     OLD_NEW_PASSWORD_EQ(50002,"原密码与新密码一致无需更改！"),
 
     NOT_DELETE_PARENT_DEPT(6001,"集团总部不可删除"),
-    NOT_DELETE_DEPT(6002,"请先删除专柜下用户"),
+    NOT_DELETE_DEPT_USER(6002,"请先删除专柜下用户"),
+    NOT_DELETE_DEPT_SHOP(6003,"请先删除专柜下店铺"),
 
     UPLOAD_ERROR(7001,"文件上传失败"),
     UPLOAD_FILE_NO_EXIST(7002,"上传文件不存在"),

src/main/java/com/cdf/controller/back/LoginController.java

@@ -15,7 +15,7 @@ public class LoginController {
     private LoginService loginService;
 
     @PostMapping("/login")
-    @SysLog("登录")
+    @SysLog(value = "登录",logType = "登录")
     ResultData login(@RequestBody LoginRequest param){
         return ResultData.ok(loginService.login(param));
     }

src/main/java/com/cdf/controller/back/SysDeptController.java

@@ -7,11 +7,13 @@ import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
 import com.cdf.entity.Dept;
 import com.cdf.entity.Menu;
+import com.cdf.entity.Shop;
 import com.cdf.entity.User;
 import com.cdf.exception.BusinessException;
 import com.cdf.response.DeptVo;
 import com.cdf.response.MenuVo;
 import com.cdf.service.IDeptService;
+import com.cdf.service.IShopService;
 import com.cdf.service.IUserService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +35,8 @@ public class SysDeptController {
     private IDeptService deptService;
     @Autowired
     private IUserService userService;
+    @Autowired
+    private IShopService shopService;
 
     @PostMapping("/saveOrUpdate")
     @SysLog(logType = "组织架构",value = "新增或修改")
@@ -60,7 +64,13 @@ public class SysDeptController {
         queryWrapper.eq(User::getDeptId,dept.getId());
         long count = userService.count(queryWrapper);
         if(count > 0){
-            throw new BusinessException(ResultCode.NOT_DELETE_DEPT);
+            throw new BusinessException(ResultCode.NOT_DELETE_DEPT_USER);
+        }
+        LambdaQueryWrapper<Shop> shopWrapper = new LambdaQueryWrapper<>();
+        shopWrapper.eq(Shop::getDeptId,dept.getId());
+        long shopCount = shopService.count(shopWrapper);
+        if(shopCount > 0){
+            throw new BusinessException(ResultCode.NOT_DELETE_DEPT_SHOP);
         }
         deptService.removeById(dept.getId());
         return ResultData.ok();