CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
雷欧（林平凡）
2025-08-05 17:51:28 +08:00
parent 3ec3e9e315
commit b2996bd5b6
5 changed files with 81 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/OrderRowsController.java
View File

@@ -1,17 +1,11 @@
package com.ruoyi.web.controller.jarvis;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/SuperAdminController.java
View File

@@ -107,7 +107,7 @@ public class SuperAdminController extends BaseController
superAdmin.setIsActive(1); // 只查询激活的管理员
List<SuperAdmin> list = superAdminService.selectSuperAdminList(superAdmin);
List<Map<String, Object>> optionList = list.stream()
.map(item -> {
.filter(item -> item.getUnionId() != null ).map(item -> {
Map<String, Object> map = new HashMap<>();
map.put("label", item.getName());
map.put("value", item.getUnionId());