From a9193cfd5ae8d7fa7e0824b5f77e4deb72695dae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 16 五月 2020 22:29:00 +0800
Subject: [PATCH] 合并代码
---
java110-code-generator/src/main/resources/template/InnerServiceSMOImpl.txt | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java110-code-generator/src/main/resources/template/InnerServiceSMOImpl.txt b/java110-code-generator/src/main/resources/template/InnerServiceSMOImpl.txt
index 61e48b5..5edf993 100644
--- a/java110-code-generator/src/main/resources/template/InnerServiceSMOImpl.txt
+++ b/java110-code-generator/src/main/resources/template/InnerServiceSMOImpl.txt
@@ -1,14 +1,14 @@
-package com.java110.commstorey.smo.impl;
+package com.java110.@@shareName@@.smo.impl;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.commstorey.dao.IStoreServiceDao;
-import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.@@shareName@@.dao.IStoreServiceDao;
import com.java110.core.smo.store.IStoreInnerServiceSMO;
+import com.java110.dto.store.StoreDto;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.StoreDto;
-import com.java110.dto.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -68,7 +68,7 @@
*/
private void refreshStore(StoreDto store, List<UserDto> users) {
for (UserDto user : users) {
- if (store.getUserId().equals(user.getUserId())) {
+ if (store.get@@Id@@().equals(user.getUserId())) {
BeanConvertUtil.covertBean(user, store);
}
}
@@ -80,10 +80,10 @@
* @param stores 灏忓尯妤间俊鎭�
* @return 鎵归噺userIds 淇℃伅
*/
- private String[] getUserIds(List<StoreDto> stores) {
+ private String[] getUserIds(List<StoreDto> stores) {
List<String> userIds = new ArrayList<String>();
for (StoreDto store : stores) {
- userIds.add(store.getUserId());
+ userIds.add(store.get@@Id@@());
}
return userIds.toArray(new String[userIds.size()]);
--
Gitblit v1.8.0