Merge remote-tracking branch 'origin/develop' into feature/ml

src/com/engine/organization/service/impl/JclOrgServiceImpl.java

@@ -51,6 +51,10 @@ public class JclOrgServiceImpl extends Service implements JclOrgService {
             if (rs.next()) {
                 zdzjFieldValue = rs.getString(zdzjFieldName);
             }
+            // 职等职级为空时不处理
+            if (StringUtils.isBlank(zdzjFieldValue)) {
+                return;
+            }
             sql = "select xlid, zjid, zdid from v_jcl_zdzjs where fid='" + zdzjFieldValue.substring(zdzjFieldValue.indexOf("_") + 1) + "'";
             rs.execute(sql);
             if (rs.next()) {