|
@@ -695,8 +695,12 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
|
// }
|
|
// }
|
|
|
SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenant));
|
|
SysTenant sysTenant = iSysTenantService.getById(Long.valueOf(tenant));
|
|
|
if (ObjectUtils.isNotNull(sysTenant) && sysTenant.getPeriodSign() == 1){
|
|
if (ObjectUtils.isNotNull(sysTenant) && sysTenant.getPeriodSign() == 1){
|
|
|
- hasSeven = true;
|
|
|
|
|
- studyRec.setCourseType(17);
|
|
|
|
|
|
|
+ if(fullName.contains("考前培训")&&fullName.contains("施工现场专业人员")){
|
|
|
|
|
+ hasSeven = true;
|
|
|
|
|
+ studyRec.setCourseType(17);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
}else if (!"继续教育二级造价师".equals(fullName)){
|
|
}else if (!"继续教育二级造价师".equals(fullName)){
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|