分部导入新增、更新

src/com/engine/organization/entity/jclimport/po/HrmFormFieldPO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.json.JSONException;
 import org.json.JSONObject;
+import weaver.general.Util;
 
 /**
  * @author:dxfeng
@@ -29,10 +30,10 @@ public class HrmFormFieldPO {
 
     public JSONObject getJsonObject(String fieldValue) throws JSONException {
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("fieldid", this.fieldId);
-        jsonObject.put("fieldhtmltype", this.fieldHtmlType);
-        jsonObject.put("type", this.type);
-        jsonObject.put("dmlurl", this.dmlUrl);
+        jsonObject.put("fieldid", Util.null2String(this.fieldId));
+        jsonObject.put("fieldhtmltype", Util.null2String(this.fieldHtmlType));
+        jsonObject.put("type", Util.null2String(this.type));
+        jsonObject.put("dmlurl", Util.null2String(this.dmlUrl));
         jsonObject.put("fieldvalue", fieldValue);
         return jsonObject;
     }

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

@@ -238,7 +238,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
         if (StringUtils.isNotBlank(importType)) {
             switch (importType) {
                 case "company":
-                    // returnMap.put("pId", companyImport(operateType, excelFile));
                     returnMap.put("pId", CompanyImport.saveImport(operateType, excelFile, user));
                     break;
                 case "department":
@@ -305,7 +304,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
     }
 
 
-
     private List<Object> getDepartmentImportForm(String templatePath) throws IOException {
 
         // 返回导入数据
@@ -566,8 +564,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
     }
 
 
-
-
     /**
      * 导入部门
      */
@@ -1872,7 +1868,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
     }
 
 
-
     /**
      * 判断表头是否正确
      *

src/com/engine/organization/util/saveimport/CompanyImport.java

@@ -4,6 +4,7 @@ import com.api.browser.bean.SearchConditionItem;
 import com.api.browser.bean.SearchConditionOption;
 import com.api.browser.util.ConditionFactory;
 import com.api.browser.util.ConditionType;
+import com.engine.hrm.util.face.hrmrestful.service.HrmFieldManagerForService;
 import com.engine.organization.entity.fieldset.param.FieldTransferParam;
 import com.engine.organization.entity.jclimport.po.HrmFormFieldPO;
 import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO;
@@ -23,7 +24,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.file.ImageFileManager;
 import weaver.general.Util;
 import weaver.hrm.User;
-import weaver.hrm.definedfield.HrmFieldManager;
 import weaver.systeminfo.SystemEnv;
 
 import java.io.IOException;
@@ -193,7 +193,7 @@ public class CompanyImport {
                         if ("subcompanyname".equalsIgnoreCase(infoPO.getFieldName())) {
                             reallyValue = cellValue;
                         } else {
-                            reallyValue = HrmFieldManager.getReallyFieldvalue(infoPO.getJsonObject(cellValue));
+                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true);
                         }
                     } catch (Exception e) {
                         historyDetailPO.setOperateDetail(cellValue + "转换失败");
@@ -228,7 +228,7 @@ public class CompanyImport {
                                 }
                             }
                         }
-                        map.put("supsubcomid", parentCompanyId);
+                        map.put("supsubcomid", Util.null2String(parentCompanyId));
 
                         companyName = split[split.length - 1];
                         map.put("subcompanyname", companyName);
@@ -265,7 +265,7 @@ public class CompanyImport {
                         OrgImportUtil.saveImportDetailLog(historyDetailPO);
                         continue;
                     }
-                    map.put("id", companyId);
+                    map.put("id", Util.null2String(companyId));
                     Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map, false).sync();
                     if (OrgImportUtil.isThrowError(syncMap)) {
                         // 刷新组织架构图