diff --git a/hcframe-parent/hcframe-config/src/main/resources/application.yml b/hcframe-parent/hcframe-config/src/main/resources/application.yml
index d9d6523..9b197ab 100644
--- a/hcframe-parent/hcframe-config/src/main/resources/application.yml
+++ b/hcframe-parent/hcframe-config/src/main/resources/application.yml
@@ -54,8 +54,8 @@ spring:
druid:
# 配置sqlite文件路径,需要填写绝对路径,推荐将sqlite文件放入到服务器上,而非程序jar包或war包中
driver-class-name: org.sqlite.JDBC
-# url: jdbc:sqlite:/Volumes/DATA/ideaProject/common-frame/hcframe/hcframe-parent/hcframe-config/src/main/resources/datasource.db
- url: jdbc:sqlite:D:/cloud/datasource.db
+ url: jdbc:sqlite:/Volumes/DATA/ideaProject/common-frame/hcframe/hcframe-parent/hcframe-config/src/main/resources/datasource.db
+# url: jdbc:sqlite:D:/cloud/datasource.db
# url: jdbc:sqlite:/home/it/user/gateway/datasource.db
username:
password:
diff --git a/hcframe-parent/hcframe-user/pom.xml b/hcframe-parent/hcframe-user/pom.xml
index 15b33db..ce2ab76 100644
--- a/hcframe-parent/hcframe-user/pom.xml
+++ b/hcframe-parent/hcframe-user/pom.xml
@@ -37,6 +37,12 @@
hcframe-cloud-starter
1.0-SNAPSHOT
+
+ org.jetbrains
+ annotations
+ RELEASE
+ compile
+
user
diff --git a/hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/service/impl/ManageServiceDataImpl.java b/hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/service/impl/ManageServiceDataImpl.java
index f38978d..58db75a 100644
--- a/hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/service/impl/ManageServiceDataImpl.java
+++ b/hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/service/impl/ManageServiceDataImpl.java
@@ -97,7 +97,9 @@ public class ManageServiceDataImpl implements ManageService {
logger.error("新增用户失败", e);
throw new ServiceException(e);
}
- return tableService.saveWithDate(TABLE_INFO, user);
+ UserConfig userConfig = userConfigService.getUserConfig();
+ OsSysTable osSysTable = OsSysTable.builder().tablePk(userConfig.getUserKey()).tableName(userConfig.getUserTableName()).build();
+ return tableService.saveWithDate(osSysTable, user);
}
@Override
@@ -111,18 +113,23 @@ public class ManageServiceDataImpl implements ManageService {
String orgDeptId = String.valueOf(user.get("ORG_DEPARTMENT_ID"));
user.put("ORG_DEPARTMENT_ID", orgDeptId.replaceAll("\"", ""));
}
- return tableService.updateWithDate(TABLE_INFO, user, version);
+ UserConfig userConfig = userConfigService.getUserConfig();
+ OsSysTable osSysTable = OsSysTable.builder().tablePk(userConfig.getUserKey()).tableName(userConfig.getUserTableName()).build();
+ return tableService.updateWithDate(osSysTable, user, version);
}
@Override
public ResultVO deleteUser(String ids) {
- return tableService.logicDelete(TABLE_INFO, ids);
+ UserConfig userConfig = userConfigService.getUserConfig();
+ OsSysTable osSysTable = OsSysTable.builder().tablePk(userConfig.getUserKey()).tableName(userConfig.getUserTableName()).build();
+ return tableService.logicDelete(osSysTable, ids);
}
@Override
public ResultVO>> getUserList(String data, WebPageInfo webPageInfo, String orgId) {
UserConfig userConfig = userConfigService.getUserConfig();
- DataMap