修改查询接口

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

@@ -19,15 +19,14 @@ import com.template.model.pojo.Users;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.AdminVo;
 import com.template.model.vo.UsersVo;
-import com.template.services.AdminMenuService;
-import com.template.services.AdminService;
-import com.template.services.PermissionSettingService;
-import com.template.services.UsersService;
+import com.template.services.*;
+import com.template.model.pojo.Organization;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -56,6 +55,9 @@ public class AdminController implements AdminAPI {
     @Autowired
     MySecurity mySecurity;
 
+    @Autowired
+    OrganizationService organizationService;
+
     @Override
     public CommonResult getListPage(int permissionSettingId, int page, int size, String keyWord, String startTime, String endTime, String status) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -99,9 +101,14 @@ public class AdminController implements AdminAPI {
             if (ObjectUtils.isNotEmpty(byId)) {
                 adminVo.setCardNumber(byId.getCardNumber());
             }
+            List<Organization> checkOrgList= new ArrayList<>();
             if (ObjectUtils.isNotEmpty(record.getCheckOrg())) {
-                List<String> checkOrg= JSONArray.parseArray(record.getCheckOrg(),String.class);
-                adminVo.setCheckOrg(checkOrg);
+                List<String> checkOrg= Arrays.asList(record.getCheckOrg().split(","));
+                for(int i=0;i<checkOrg.size();i++){
+                    Organization organization=organizationService.getById(checkOrg.get(i));
+                    checkOrgList.add(organization);
+                }
+                adminVo.setCheckOrg(checkOrgList);
             }
 
 //            解密

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

@@ -2,10 +2,12 @@ package com.template.model.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.template.model.pojo.AdminMenu;
+import com.template.model.pojo.Organization;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class AdminVo {
@@ -37,7 +39,7 @@ public class AdminVo {
     private String department;
 
     @ApiModelProperty(value = "审批组织部门")
-    private List<String> checkOrg;
+    private List<Organization> checkOrg;
 
     @ApiModelProperty(value = "状态 1：正常，2：冻结")
     private String status;