From 4c657d1692d22329a4e2f2c43a35684753e8acf9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 14:58:07 +0800
Subject: [PATCH] # 企业端用户 导入
---
server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java | 4 ++--
server/src/main/resources/application.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
index ac31276..e22b797 100644
--- a/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/DeviceServiceImpl.java
@@ -219,11 +219,11 @@
}
}
- QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
+ Device queryDeviceExtDTO=new Device();
queryDeviceExtDTO.setDeleted(Constants.ZERO);
queryDeviceExtDTO.setCode(device.getCode());
queryDeviceExtDTO.setRootDepartId(user.getRootDepartment().getId());
- List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
+ List<Device> list= this.findList(queryDeviceExtDTO);
/* QueryDeviceExtDTO queryDeviceExtDTO1=new QueryDeviceExtDTO();
queryDeviceExtDTO1.setDeleted(Constants.ZERO);
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index dd0fac5..72fcf23 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standardPro
+ active: standard
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3