Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateTemplateServiceImpl.java

@@ -57,10 +57,14 @@ public class EvaluateTemplateServiceImpl extends MPJBaseServiceImpl<EvaluateTemp
                     deptName.append(",");
                     deptIdSb.append(",");
                 }
-                deptName.append(departmentMap.get(deptIds[i]));
+                if (deptIds[i].equals("0")) {
+                    deptName.append("通用");
+                } else {
+                    deptName.append(departmentMap.get(deptIds[i]));
+                }
                 deptIdSb.append(deptIds[i]);
             }
-            record.setDeptNames(deptName.equals("null")? "通用": deptName.toString());
+            record.setDeptNames(deptName.toString().equals("null")? "通用": deptName.toString());
             record.setDeptIds("[" + deptIdSb.toString() + "]");
         }
         return voPage;