pipIrr-SV.git - Gitblit

			@@ -7,7 +7,6 @@
			import com.dy.common.webUtil.BaseResponseUtils;
			import com.dy.common.webUtil.ResultCodeMsg;
			import com.dy.pipIrrGlobal.pojoBa.BaUser;
			import com.dy.pipIrrGlobal.util.DistrictLevel;
			import com.dy.pipIrrGlobal.util.Org;
			import com.mysql.cj.util.StringUtils;
			import io.swagger.v3.oas.annotations.Hidden;
			@@ -22,12 +21,10 @@
			import jakarta.validation.Valid;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			//import org.springframework.cache.CacheManager;
			import org.springframework.http.MediaType;
			import org.springframework.validation.BindingResult;
			import org.springframework.web.bind.annotation.*;

			import java.util.Arrays;
			import java.util.List;
			import java.util.Objects;
			import java.util.UUID;
			@@ -71,7 +68,7 @@
			)
			})
			@GetMapping(path = "allOrg")
			public BaseResponse<List<Org>> allOrg(){
			public BaseResponse<List<Org.OrgVo>> allOrg(){
			//List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
			return BaseResponseUtils.buildSuccess(Org.OrgList);
			}
			@@ -246,10 +243,10 @@
			if(userPo != null){
			vo.dataSourceName = userPo.orgTag ;
			vo.logined = true ;
			vo.hasPower = true ;//默认有权限
			vo.hasPower = true ;//默认有权限。2023-12-21 经商议，由前端鉴权
			}else{
			vo.logined = false ;
			vo.hasPower = true ;//默认有权限
			vo.hasPower = true ;//默认有权限。2023-12-21 经商议，由前端鉴权
			}
			return vo ;
			}
			@@ -308,7 +305,7 @@
			CurUserVo vo = new CurUserVo();
			if(userPo != null){
			vo.id = userPo.id ;
			vo.name = userPo.name ;
			vo.name = userPo.userName;
			}
			return vo ;
			}