|
|
|
@ -835,17 +835,19 @@ public class CollectModel {
|
|
|
|
|
*/
|
|
|
|
|
List<Integer> OrgTypeList = new ArrayList<>();
|
|
|
|
|
if (org_type_id != -1) OrgTypeList.add(org_type_id);
|
|
|
|
|
if (query_type_id == 1) {
|
|
|
|
|
OrgTypeList.add(5);
|
|
|
|
|
OrgTypeList.add(8);
|
|
|
|
|
OrgTypeList.add(9);
|
|
|
|
|
OrgTypeList.add(10);
|
|
|
|
|
OrgTypeList.add(11);
|
|
|
|
|
} else if (query_type_id == 2) {
|
|
|
|
|
OrgTypeList.add(12);
|
|
|
|
|
OrgTypeList.add(14);
|
|
|
|
|
OrgTypeList.add(15);
|
|
|
|
|
OrgTypeList.add(16);
|
|
|
|
|
else{
|
|
|
|
|
if (query_type_id == 1) {
|
|
|
|
|
OrgTypeList.add(5);
|
|
|
|
|
OrgTypeList.add(8);
|
|
|
|
|
OrgTypeList.add(9);
|
|
|
|
|
OrgTypeList.add(10);
|
|
|
|
|
OrgTypeList.add(11);
|
|
|
|
|
} else if (query_type_id == 2) {
|
|
|
|
|
OrgTypeList.add(12);
|
|
|
|
|
OrgTypeList.add(14);
|
|
|
|
|
OrgTypeList.add(15);
|
|
|
|
|
OrgTypeList.add(16);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (OrgTypeList.size() > 0) kv.set("OrgTypeList", OrgTypeList);
|
|
|
|
|
if (exclude_self == 1) kv.set("bureau_id", bureau_id);
|
|
|
|
|