Accept Merge Request #24: (develop-wxl -> master)

Merge Request: 账号管理增加审核部门字段

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/24

src/main/java/com/template/api/OrganizationControllerAPI.java

@@ -0,0 +1,22 @@
+package com.template.api;
+
+import com.template.model.request.changePasswordRequest;
+import com.template.model.request.loginRequest;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+
+@RequestMapping("/auto/organization")
+@Api(tags = {"LoginController"}, value = "登录")
+public interface OrganizationControllerAPI {
+
+
+    @PostMapping(value = "/queryAll")
+    @ApiOperation(value = "查询全部", notes = "查询全部", httpMethod = "POST")
+    CommonResult queryAll( );
+
+}

src/main/java/com/template/controller/AdminController.java

@@ -1,6 +1,7 @@
 package com.template.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -98,6 +99,10 @@ public class AdminController implements AdminAPI {
             if (ObjectUtils.isNotEmpty(byId)) {
                 adminVo.setCardNumber(byId.getCardNumber());
             }
+            if (ObjectUtils.isNotEmpty(record.getCheckOrg())) {
+                List<String> checkOrg= JSONArray.parseArray(record.getCheckOrg(),String.class);
+                adminVo.setCheckOrg(checkOrg);
+            }
 
 //            解密
             try {
@@ -153,6 +158,7 @@ public class AdminController implements AdminAPI {
             BeanUtils.copyProperties(saveAdminDto, admin);
             admin.setPassWord(encrypt);
             admin.setStatus("1");
+//            admin.setCheckOrg(saveAdminDto.getCheckOrg().toString());
             admin.setUsersId(users.getId()+"");
             adminService.save(admin);
             return CommonResult.ok();

src/main/java/com/template/controller/OrganizationController.java

@@ -1,6 +1,11 @@
 package com.template.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.template.api.OrganizationControllerAPI;
+import com.template.model.result.CommonResult;
+import com.template.services.OrganizationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +19,14 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2024-08-22
  */
 @RestController
-@RequestMapping("/auto/organization")
-public class OrganizationController {
+public class OrganizationController implements OrganizationControllerAPI {
 
+    @Autowired
+    private OrganizationService organizationService;
+
+    @Override
+    public CommonResult queryAll() {
+        return CommonResult.ok(organizationService.list(new QueryWrapper<>()));
+    }
 }
 

src/main/java/com/template/model/dto/SaveAdminDto.java

@@ -2,6 +2,8 @@ package com.template.model.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class SaveAdminDto {
     public String permissionSettingId;
@@ -20,6 +22,8 @@ public class SaveAdminDto {
     public String phoneNumber;
 //    部门
     public String department;
+//审批组织
+    private String checkOrg;
 
 
 }

src/main/java/com/template/model/pojo/Admin.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.List;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -49,6 +50,10 @@ public class Admin implements Serializable {
     @ApiModelProperty(value = "部门")
     private String department;
 
+    @ApiModelProperty(value = "审批组织部门")
+    private String checkOrg;
+
+
     @ApiModelProperty(value = "状态 1：正常，2：冻结")
     private String status;
 

src/main/java/com/template/model/vo/AdminVo.java

@@ -5,6 +5,8 @@ import com.template.model.pojo.AdminMenu;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class AdminVo {
     @ApiModelProperty(value = "卡号")
@@ -34,6 +36,9 @@ public class AdminVo {
     @ApiModelProperty(value = "部门")
     private String department;
 
+    @ApiModelProperty(value = "审批组织部门")
+    private List<String> checkOrg;
+
     @ApiModelProperty(value = "状态 1：正常，2：冻结")
     private String status;