From de2f7fe7f23ac338b7d6997a74b3715e9b1a7cc7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 十一月 2023 10:56:18 +0800
Subject: [PATCH] 1、行政区保存功能,修改自动加上行政区级别,及删除标志 2、单点登录中增加了获得所有组织机构的功能,及增加组织机构枚举类型 3、增加农户实体、农户类型实体、分水口实体等相关功能

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index a83b6cf..6eb252b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -23,10 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Objects;
@@ -58,9 +55,11 @@
                             schema = @Schema(implementation = BaUser.class))}
             )
     })
-    @PostMapping(path = "some")
+    @PostMapping(path = "some", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @SsoAop("-1")
-    public BaseResponse<QueryResultVo<List<BaUser>>> some(QueryVo vo){
+    //濡傛灉鍓嶇璇锋眰鏁版嵁鏄痡son锛屽垯瑕佸姞涓婃敞瑙RequestBody
+    //public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟鏁版嵁", required = true) @Valid QueryVo vo){
+    public BaseResponse<QueryResultVo<List<BaUser>>> some(@Parameter(description = "鏌ヨform琛ㄥ崟鏁版嵁", required = true) @Valid QueryVo vo){
         try {
             QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo) ;
             return BaseResponseUtils.buildSuccess(res);
@@ -252,7 +251,7 @@
     @GetMapping(path = "setRoles", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @SsoAop("-1")//@SsoAop(power = "-1")
     public BaseResponse<Boolean> setRoles(@Parameter(description = "瀹炰綋id", required = true) String id,
-                                          @Parameter(description = "瑙掕壊id鏁扮粍闆嗗悎") String[] roleIds){
+                                          @Parameter(description = "瑙掕壊id鏁扮粍") String[] roleIds){
         Long[] roleId_lg = null ;
         if(roleIds != null && roleIds.length > 0){
             roleId_lg = new Long[roleIds.length] ;

--
Gitblit v1.8.0