From 48e850f8721a5562c2d0c23f9281f92ec1ba947a Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 13 一月 2025 15:18:30 +0800
Subject: [PATCH] DNC平移航宇救生修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
index 674fc8c..beec47a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java
@@ -16,6 +16,7 @@
import org.jeecg.modules.dnc.service.IProductInfoService;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
+import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.system.entity.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -59,7 +60,7 @@
public QueryListResponseResult<CommonGenericTree> loadProductTree() {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.loadProductTree(userId);
if(list == null)
@@ -73,7 +74,7 @@
public QueryListResponseResult<CommonGenericTree> loadBaseTree() {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.loadBaseTree(userId);
if(list == null)
@@ -87,7 +88,7 @@
public QueryListResponseResult<CommonGenericTree> loadTree(@PathVariable("nodeType") Integer nodeType, @PathVariable("paramId") String paramId) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.loadTree(userId, nodeType, paramId);
if(list == null)
@@ -245,7 +246,7 @@
public QueryListResponseResult<CommonGenericTree> searchProductTree(String queryParam) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = user.getId();
- if(!StrUtil.isEmpty(userId))
+ if(!ValidateUtil.validateString(userId))
return new QueryListResponseResult<>(CommonCode.SUCCESS, Collections.emptyList());
List<CommonGenericTree> list = productInfoService.searchProductTree(userId, queryParam);
if(list == null)
--
Gitblit v1.9.3