licailing 4 年之前
父节点
当前提交
fe1873b881

+ 21 - 21
src/main/java/com/izouma/wenlvju/utils/JpaUtils.java

@@ -144,27 +144,27 @@ public class JpaUtils {
                     and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
                     and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
                 }
                 }
 
 
-            } else if (Long.class == fieldType) {
-                if (value instanceof Collection) {
-                    if (!((Collection) value).isEmpty()) {
-                        List list = new ArrayList();
-                        for (Object o : ((Collection) value)) {
-                            list.add(Convert.convert(Long.class, o));
-                        }
-                        and.add(root.get(property).in(list));
-                    }
-                } else if (value instanceof String && StringUtils.isNotEmpty((String) value)) {
-                    if (((String) value).contains(",")) {
-                        String[] arr = ((String) value).split(",");
-                        List list = new ArrayList();
-                        for (String s : arr) {
-                            list.add(Convert.convert(Long.class, s));
-                        }
-                        and.add(root.get(property).in(list));
-                    }
-                } else {
-                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
-                }
+//            } else if (Long.class == fieldType) {
+//                if (value instanceof Collection) {
+//                    if (!((Collection) value).isEmpty()) {
+//                        List list = new ArrayList();
+//                        for (Object o : ((Collection) value)) {
+//                            list.add(Convert.convert(Long.class, o));
+//                        }
+//                        and.add(root.get(property).in(list));
+//                    }
+//                } else if (value instanceof String && StringUtils.isNotEmpty((String) value)) {
+//                    if (((String) value).contains(",")) {
+//                        String[] arr = ((String) value).split(",");
+//                        List list = new ArrayList();
+//                        for (String s : arr) {
+//                            list.add(Convert.convert(Long.class, s));
+//                        }
+//                        and.add(root.get(property).in(list));
+//                    }
+//                } else {
+//                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
+//                }
             } else {
             } else {
                 and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
                 and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
             }
             }

+ 1 - 1
src/main/vue/src/views/performance/ProgrammeResultList.vue

@@ -38,7 +38,7 @@
                     </el-col>
                     </el-col>
                     <el-col :span="8">
                     <el-col :span="8">
                         <el-form-item label="奖项">
                         <el-form-item label="奖项">
-                            <el-select v-model="form.awardId" clearable multiple>
+                            <el-select v-model="form.awardId" clearable>
                                 <el-option
                                 <el-option
                                     v-for="item in awards"
                                     v-for="item in awards"
                                     :key="item.value"
                                     :key="item.value"