caozixuan 1 жил өмнө
parent
commit
97e8b8366a

+ 4 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ConditionServiceImpl.java

@@ -252,20 +252,20 @@ public class ConditionServiceImpl implements ConditionService {
 
 
     @Override
     @Override
     public List<ObeCultureProgram> listCultureProgram(Long professionalId) {
     public List<ObeCultureProgram> listCultureProgram(Long professionalId) {
+        List<ObeCultureProgram> result = new ArrayList<>();
         Long privilegeId = ServletUtil.getCurrentPrivilegeId();
         Long privilegeId = ServletUtil.getCurrentPrivilegeId();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         String privilegeIdString = privilegeId == null ? null : String.valueOf(privilegeId);
         String privilegeIdString = privilegeId == null ? null : String.valueOf(privilegeId);
         // 课程大纲管理、课程考核设置、课程目标达成度统计
         // 课程大纲管理、课程考核设置、课程目标达成度统计
         if ("3000".equals(privilegeIdString) || "3001".equals(privilegeIdString) || "2002".equals(privilegeIdString)) {
         if ("3000".equals(privilegeIdString) || "3001".equals(privilegeIdString) || "2002".equals(privilegeIdString)) {
-            conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
+            result = conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
         }
         }
         // 成绩管理
         // 成绩管理
         else if ("2001".equals(privilegeIdString)) {
         else if ("2001".equals(privilegeIdString)) {
-            conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
+            result = conditionMapper.listCultureProgram(schoolId, professionalId, dpr);
         }
         }
-        return new ArrayList<>();
-
+        return result;
     }
     }
 
 
     @Override
     @Override