init

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UnionController.java

@@ -3,6 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.Union;
+import com.ruoyi.cai.dto.admin.query.UsercodeReq;
 import com.ruoyi.cai.dto.admin.vo.UnionAdminVo;
 import com.ruoyi.cai.service.UnionService;
 import com.ruoyi.common.annotation.Log;
@@ -66,13 +67,10 @@ public class UnionController extends BaseController {
     @Log(title = "工会列表", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody Union bo) {
-        return toAjax(unionService.save(bo));
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UsercodeReq bo) {
+        return toAjax(unionService.saveUnion(bo.getUsercode()));
     }
 
-    /**
-     * 修改工会列表
-     */
     @SaCheckPermission("cai:userUnion:edit")
     @Log(title = "工会列表", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
@@ -82,15 +80,12 @@ public class UnionController extends BaseController {
     }
 
     /**
-     * 删除工会列表
-     *
-     * @param ids 主键串
+     * 解散工会
      */
     @SaCheckPermission("cai:userUnion:remove")
     @Log(title = "工会列表", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(unionService.removeBatchByIds(Arrays.asList(ids)));
+    @DeleteMapping("/{id}")
+    public R<Void> dissolve(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return toAjax(unionService.dissolve(id));
     }
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java

@@ -1,8 +1,10 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.User;
+import com.ruoyi.cai.domain.UserCodeGen;
 import com.ruoyi.cai.dto.admin.query.ResetPasswordReq;
 import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
 import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
@@ -19,12 +21,15 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户
@@ -51,6 +56,24 @@ public class UserController extends BaseController {
         return TableDataInfo.build(result);
     }
 
+    @GetMapping("/getByUsercode")
+    public R<User> getByUsercode(String usercode){
+        return R.ok(userService.getByUserCode(usercode));
+    }
+
+    @GetMapping("/listByUserCode")
+    public R<List<String>> listByUserCode(String usercode,int limit){
+        if(limit == 0){
+            limit = 40;
+        }
+        List<User> users = userService.list(Wrappers.lambdaQuery(User.class)
+                .select(User::getUsercode)
+                .like(StringUtils.isNotEmpty(usercode), User::getUsercode, usercode)
+                .last("limit " + limit));
+        return R.ok(users.stream().map(User::getUsercode).collect(Collectors.toList()));
+    }
+
+
     /**
      * 获取用户详细信息
      *
@@ -97,16 +120,10 @@ public class UserController extends BaseController {
         return R.ok();
     }
 
-    /**
-     * 删除用户
-     *
-     * @param ids 主键串
-     */
     @SaCheckPermission("cai:user:remove")
     @Log(title = "用户", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Integer[] ids) {
-        return toAjax(userService.removeBatchByIds(Arrays.asList(ids)));
+    @DeleteMapping("/{id}")
+    public R<Void> remove(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return toAjax(userService.removeUser(id));
     }
 }