|
|
@@ -142,43 +142,41 @@ public class BasicKeeperServiceImpl implements BasicKeeperService {
|
|
142
|
142
|
} else {
|
|
143
|
143
|
keeper = new BasicKeeper();
|
|
144
|
144
|
}
|
|
145
|
|
-
|
|
146
|
|
-
|
|
147
|
|
-
|
|
|
145
|
+
|
|
148
|
146
|
map.put("keeper", keeper);
|
|
149
|
147
|
|
|
150
|
148
|
|
|
151
|
149
|
//如果有一种类型的集合是空的,那么先给new一个空对象
|
|
152
|
|
- if (null == xlxwList || xlxwList.size() == 0) {
|
|
153
|
|
- ekeObje = new BasicKeeperEducation();
|
|
154
|
|
- ekeObje.setKeeperId(keeper.getId());
|
|
155
|
|
- ekeObje.setDatatype(1);
|
|
156
|
|
- xlxwList.add(ekeObje);
|
|
157
|
|
- }
|
|
158
|
|
- if (null == zyjsList || zyjsList.size() == 0) {
|
|
159
|
|
- ekeObje = new BasicKeeperEducation();
|
|
160
|
|
- ekeObje.setKeeperId(keeper.getId());
|
|
161
|
|
- ekeObje.setDatatype(2);
|
|
162
|
|
- zyjsList.add(ekeObje);
|
|
163
|
|
- }
|
|
164
|
|
- if (null == zyzgList || zyzgList.size() == 0) {
|
|
165
|
|
- ekeObje = new BasicKeeperEducation();
|
|
166
|
|
- ekeObje.setKeeperId(keeper.getId());
|
|
167
|
|
- ekeObje.setDatatype(3);
|
|
168
|
|
- zyzgList.add(ekeObje);
|
|
169
|
|
- }
|
|
170
|
|
- if (null == sgzList || sgzList.size() == 0) {
|
|
171
|
|
- ekeObje = new BasicKeeperEducation();
|
|
172
|
|
- ekeObje.setKeeperId(keeper.getId());
|
|
173
|
|
- ekeObje.setDatatype(4);
|
|
174
|
|
- sgzList.add(ekeObje);
|
|
175
|
|
- }
|
|
176
|
|
- if (null == jllgList || jllgList.size() == 0) {
|
|
177
|
|
- ekeObje = new BasicKeeperEducation();
|
|
178
|
|
- ekeObje.setKeeperId(keeper.getId());
|
|
179
|
|
- ekeObje.setDatatype(5);
|
|
180
|
|
- jllgList.add(ekeObje);
|
|
181
|
|
- }
|
|
|
150
|
+// if (null == xlxwList || xlxwList.size() == 0) {
|
|
|
151
|
+// ekeObje = new BasicKeeperEducation();
|
|
|
152
|
+// ekeObje.setKeeperId(keeper.getId());
|
|
|
153
|
+// ekeObje.setDatatype(1);
|
|
|
154
|
+// xlxwList.add(ekeObje);
|
|
|
155
|
+// }
|
|
|
156
|
+// if (null == zyjsList || zyjsList.size() == 0) {
|
|
|
157
|
+// ekeObje = new BasicKeeperEducation();
|
|
|
158
|
+// ekeObje.setKeeperId(keeper.getId());
|
|
|
159
|
+// ekeObje.setDatatype(2);
|
|
|
160
|
+// zyjsList.add(ekeObje);
|
|
|
161
|
+// }
|
|
|
162
|
+// if (null == zyzgList || zyzgList.size() == 0) {
|
|
|
163
|
+// ekeObje = new BasicKeeperEducation();
|
|
|
164
|
+// ekeObje.setKeeperId(keeper.getId());
|
|
|
165
|
+// ekeObje.setDatatype(3);
|
|
|
166
|
+// zyzgList.add(ekeObje);
|
|
|
167
|
+// }
|
|
|
168
|
+// if (null == sgzList || sgzList.size() == 0) {
|
|
|
169
|
+// ekeObje = new BasicKeeperEducation();
|
|
|
170
|
+// ekeObje.setKeeperId(keeper.getId());
|
|
|
171
|
+// ekeObje.setDatatype(4);
|
|
|
172
|
+// sgzList.add(ekeObje);
|
|
|
173
|
+// }
|
|
|
174
|
+// if (null == jllgList || jllgList.size() == 0) {
|
|
|
175
|
+// ekeObje = new BasicKeeperEducation();
|
|
|
176
|
+// ekeObje.setKeeperId(keeper.getId());
|
|
|
177
|
+// ekeObje.setDatatype(5);
|
|
|
178
|
+// jllgList.add(ekeObje);
|
|
|
179
|
+// }
|
|
182
|
180
|
|
|
183
|
181
|
map.put("xlxwList", xlxwList);
|
|
184
|
182
|
map.put("zyjsList", zyjsList);
|