Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
99be262a
Commit
99be262a
authored
Aug 04, 2019
by
季圣华
Browse files
解决系统配置的bug
parent
1e4675a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
erp_web/pages/manage/systemConfig.html
View file @
99be262a
...
...
@@ -392,7 +392,7 @@
async
:
false
,
data
:
({
id
:
systemConfigId
,
companyN
ame
:
companyName
n
ame
:
companyName
}),
success
:
function
(
res
)
{
if
(
res
&&
res
.
code
===
200
)
{
...
...
src/main/java/com/jsh/erp/controller/SupplierController.java
View file @
99be262a
...
...
@@ -86,7 +86,7 @@ public class SupplierController {
List
<
Supplier
>
supplierList
=
supplierService
.
findBySelectCus
();
JSONArray
dataArray
=
new
JSONArray
();
if
(
null
!=
supplierList
)
{
boolean
depot
Flag
=
systemConfigService
.
get
Depot
Flag
();
boolean
customer
Flag
=
systemConfigService
.
get
Customer
Flag
();
for
(
Supplier
supplier
:
supplierList
)
{
JSONObject
item
=
new
JSONObject
();
//勾选判断1
...
...
@@ -96,7 +96,7 @@ public class SupplierController {
}
catch
(
DataAccessException
e
)
{
logger
.
error
(
">>>>>>>>>>>>>>>>>查询用户对应的客户:存在异常!"
);
}
if
(!
depot
Flag
||
flag
)
{
if
(!
customer
Flag
||
flag
)
{
item
.
put
(
"id"
,
supplier
.
getId
());
item
.
put
(
"supplier"
,
supplier
.
getSupplier
());
//客户名称
dataArray
.
add
(
item
);
...
...
Write
Preview
Supports
Markdown
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