Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -1042,12 +1042,19 @@ public class CollectModel {
     /**
      * 功能:获取单位类型
      *
-     * @param bureau_id
+     * @param target_id
      * @return
      */
-    private int getOrgTypeId(String bureau_id) {
+    private int getOrgTypeId(String target_id, boolean forPerson) {
+        String org_id = target_id;
+        if (forPerson) {
+            String sql = "select org_id from t_sys_loginperson where person_id=?";
+            Record record = Db.findFirst(sql, target_id);
+            org_id = record.getStr("org_id");
+        }
         String sql = "select org_type_id from t_base_organization where org_id=?";
-        int org_type_id = Db.findFirst(sql, bureau_id).getInt("org_type_id");
+        Record record = Db.findFirst(sql, org_id);
+        int org_type_id = record.getInt("org_type_id");
         return org_type_id;//其它的统一回3，表示是单位
     }
 
@@ -1082,6 +1089,8 @@ public class CollectModel {
         Record jobRecord = getJob(job_id);
         String bureau_id = jobRecord.getStr("bureau_id");//发布单位id
         Set<String> targetSet = new HashSet<>();
+
+        boolean forPerson = false;
         //市级发布
         if (publish_job_type_id == 1) {
             if (xiaShuSchool == 1) {
@@ -1115,6 +1124,7 @@ public class CollectModel {
         else if (publish_job_type_id == 2) {
             //所有老师
             if (allTeacher == 1) {
+                forPerson = true;
                 for (Record r : getAllTeacher(bureau_id)) {
                     targetSet.add(r.getStr("person_id"));
                 }
@@ -1137,26 +1147,31 @@ public class CollectModel {
         else if (publish_job_type_id == 3) {
             //所有老师
             if (allTeacher == 1) {
+                forPerson = true;
                 for (Record r : getAllTeacher(bureau_id)) {
                     targetSet.add(r.getStr("person_id"));
                 }
             }
             //所有学生
             if (allStudent == 1) {
+                forPerson = true;
                 for (Record r : getAllStudent(bureau_id)) {
                     targetSet.add(r.getStr("person_id"));
                 }
             }
             //年级
             for (Record r : getNianJiStudent(bureau_id, njIds)) {
+                forPerson = true;
                 targetSet.add(r.getStr("person_id"));
             }
             //班级
             for (Record r : getBanJiStudent(bureau_id, classIds)) {
+                forPerson = true;
                 targetSet.add(r.getStr("person_id"));
             }
             //人员
             if (!StrKit.isBlank(personIds)) {
+                forPerson = true;
                 for (String s : personIds.split(",")) {
                     targetSet.add(s);
                 }
@@ -1192,8 +1207,7 @@ public class CollectModel {
         List<Record> list = new ArrayList<>();
         for (String s : targetSet) {
             //哪种类型的单位要接受这个任务呢？
-            int orgTypeId = 0;
-            if (target_type_id == 1) orgTypeId = getOrgTypeId(s);
+            int orgTypeId = getOrgTypeId(s, forPerson);
             List<Integer> statusCodeList = new ArrayList<>();
             //按发布对象分类
             switch (target_type_id) {