diff --git a/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc b/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc new file mode 100644 index 00000000..e4bb558d Binary files /dev/null and b/WebRoot/upload/03E8867B-7915-4663-9567-59EF12A01556.doc differ diff --git a/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc b/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc new file mode 100644 index 00000000..e4bb558d Binary files /dev/null and b/WebRoot/upload/06066597-5B73-40FE-B49E-A72D2017614A.doc differ diff --git a/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc b/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc new file mode 100644 index 00000000..e4bb558d Binary files /dev/null and b/WebRoot/upload/1CEA9293-8301-4C95-9CDC-4318AE9330BA.doc differ diff --git a/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc b/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc new file mode 100644 index 00000000..e4bb558d Binary files /dev/null and b/WebRoot/upload/5BD6A20E-8034-4567-BB45-0BD0902D374F.doc differ diff --git a/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc b/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc new file mode 100644 index 00000000..e4bb558d Binary files /dev/null and b/WebRoot/upload/B1CED318-4295-43F8-AF34-9722ACB2BAFF.doc differ diff --git a/WebRoot/upload/E4F4E145-62DB-4F90-98A5-35FE50780634.doc b/WebRoot/upload/E4F4E145-62DB-4F90-98A5-35FE50780634.doc new file mode 100644 index 00000000..e4bb558d Binary files /dev/null and b/WebRoot/upload/E4F4E145-62DB-4F90-98A5-35FE50780634.doc differ diff --git a/WebRoot/upload/FC557256-6684-406C-BB63-7C009B739A17.doc b/WebRoot/upload/FC557256-6684-406C-BB63-7C009B739A17.doc new file mode 100644 index 00000000..e4bb558d Binary files /dev/null and b/WebRoot/upload/FC557256-6684-406C-BB63-7C009B739A17.doc differ diff --git a/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java b/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java index b3d8cc5b..9ad73289 100644 --- a/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java +++ b/src/main/java/com/dsideal/QingLong/Gtzz/Model/GtzzModel.java @@ -1015,7 +1015,7 @@ public class GtzzModel { //如果是历史日志里的专家 String sql = "select t1.step_code,t1.is_master,t2.* from t_gtzz_subject_expert as t1 inner join t_gtzz_expert as t2 on t1.person_id=t2.person_id where t1.subject_id=? and t1.step_code=? and t1.progress_id=?"; List list = Db.find(sql, subject_id, step_code, progress_id); - if (list != null && list.size() > 0) return list; + if (list != null && !list.isEmpty()) return list; //则查询返回正常的专家 sql = "select t1.step_code,t1.is_master,t2.* from t_gtzz_subject_expert as t1 inner join t_gtzz_expert as t2 on t1.person_id=t2.person_id where t1.subject_id=? and t1.step_code=? and t1.progress_id=0"; return Db.find(sql, subject_id, step_code);