Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
474cca92
Commit
474cca92
authored
Dec 08, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
回显数据字典防止空值报错
parent
1657e06b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
SysDictDataController.java
...om/ruoyi/web/controller/system/SysDictDataController.java
+8
-4
No files found.
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View file @
474cca92
package
com
.
ruoyi
.
web
.
controller
.
system
;
package
com
.
ruoyi
.
web
.
controller
.
system
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
...
@@ -19,6 +20,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
...
@@ -19,6 +20,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.system.service.ISysDictDataService
;
import
com.ruoyi.system.service.ISysDictDataService
;
import
com.ruoyi.system.service.ISysDictTypeService
;
import
com.ruoyi.system.service.ISysDictTypeService
;
...
@@ -74,8 +76,10 @@ public class SysDictDataController extends BaseController
...
@@ -74,8 +76,10 @@ public class SysDictDataController extends BaseController
public
AjaxResult
dictType
(
@PathVariable
String
dictType
)
public
AjaxResult
dictType
(
@PathVariable
String
dictType
)
{
{
List
<
SysDictData
>
data
=
dictTypeService
.
selectDictDataByType
(
dictType
);
List
<
SysDictData
>
data
=
dictTypeService
.
selectDictDataByType
(
dictType
);
if
(
data
==
null
)
if
(
StringUtils
.
isNull
(
data
))
data
=
new
ArrayList
<>();
{
data
=
new
ArrayList
<
SysDictData
>();
}
return
AjaxResult
.
success
(
data
);
return
AjaxResult
.
success
(
data
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment