|
@@ -276,7 +276,7 @@ public class NpQueryServiceImpl implements INpQueryService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Page<NpFormwork> getCommonTemplate(Integer type, Integer pageNum, Integer size) {
|
|
|
|
|
|
+ public Page<NpFormwork> getCommonTemplate(Integer formworkType, Integer type, Integer pageNum, Integer size) {
|
|
if (type == null) {
|
|
if (type == null) {
|
|
|
|
|
|
}
|
|
}
|
|
@@ -288,13 +288,13 @@ public class NpQueryServiceImpl implements INpQueryService {
|
|
}
|
|
}
|
|
Page<NpFormwork> formworkPage = null;
|
|
Page<NpFormwork> formworkPage = null;
|
|
Page<NpFormwork> page = new Page<>(pageNum, size);
|
|
Page<NpFormwork> page = new Page<>(pageNum, size);
|
|
-// if (1 == type) {
|
|
|
|
- formworkPage = npTemplateDraftMapper.getCommonTemplate(null, type, page);
|
|
|
|
-// }
|
|
|
|
-// if (2 == type) {
|
|
|
|
-// Long baseUserId = SecurityUser.getUserId();
|
|
|
|
-// formworkPage = npTemplateDraftMapper.getCommonTemplate(baseUserId, type, page);
|
|
|
|
-// }
|
|
|
|
|
|
+ if (1 == type) {
|
|
|
|
+ Long baseUserId = SecurityUser.getUserId();
|
|
|
|
+ formworkPage = npTemplateDraftMapper.getCommonTemplate(baseUserId, formworkType, type, page);
|
|
|
|
+ }
|
|
|
|
+ if (2 == type) {
|
|
|
|
+ formworkPage = npTemplateDraftMapper.getCommonTemplate(null, formworkType, type, page);
|
|
|
|
+ }
|
|
return formworkPage;
|
|
return formworkPage;
|
|
}
|
|
}
|
|
|
|
|