init

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/AreaCodeController.java

@@ -13,6 +13,8 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.AreaCode;
+import com.ruoyi.xq.dto.admin.areacode.AreaCodeAdminTree;
+import com.ruoyi.xq.dto.app.areacode.AreaCodeTree;
 import com.ruoyi.xq.service.AreaCodeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 行政区划
@@ -58,6 +61,12 @@ public class AreaCodeController extends BaseController {
         return R.ok(areaCodeService.getById(code));
     }
 
+    @GetMapping("/tree")
+    public R<List<AreaCodeAdminTree>> areaCodeTree(){
+        List<AreaCodeAdminTree> node = areaCodeService.treeAdmin();
+        return R.ok(node);
+    }
+
     /**
      * 新增行政区划
      */

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java

@@ -15,8 +15,10 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.User;
 import com.ruoyi.xq.dto.admin.user.FullUserVo;
 import com.ruoyi.xq.dto.admin.user.UserAdminVo;
+import com.ruoyi.xq.dto.admin.user.req.AddUserReq;
 import com.ruoyi.xq.dto.admin.user.req.ResetPasswordAdminReq;
 import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
+import com.ruoyi.xq.dto.admin.user.req.UpdateUserReq;
 import com.ruoyi.xq.dto.app.common.IdReq;
 import com.ruoyi.xq.service.UserInviteService;
 import com.ruoyi.xq.service.UserService;
@@ -169,8 +171,9 @@ public class UserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody User bo) {
-        return toAjax(userService.save(bo));
+    public R<Void> add(@RequestBody AddUserReq bo) {
+        userService.saveUser(bo);
+        return R.ok();
     }
 
     /**
@@ -180,8 +183,9 @@ public class UserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody User bo) {
-        return toAjax(userService.updateById(bo));
+    public R<Void> edit(@RequestBody UpdateUserReq bo) {
+        userService.updateBaseUser(bo);
+        return R.ok();
     }
 
     /**

ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java

@@ -12,7 +12,6 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.xq.domain.UserInfo;
-import com.ruoyi.xq.dto.admin.user.UserInfoDetailAdminVo;
 import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo;
 import com.ruoyi.xq.service.UserInfoService;
 import lombok.RequiredArgsConstructor;
@@ -47,13 +46,6 @@ public class UserInfoController extends BaseController {
         return TableDataInfo.build(page);
     }
 
-    @SaCheckPermission("xq:userInfo:query")
-    @GetMapping("/fullUserInfo/{id}")
-    public R<UserInfoDetailAdminVo> fullUserInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
-        UserInfoDetailAdminVo vo = userInfoService.fullUserInfo(id);
-        return R.ok(vo);
-    }
-
     /**
      * 获取用户信息详细信息
      *