花名册-列定制添加分部

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

@@ -306,7 +306,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<String> selectKeys;
         if ("custom".equals(type)) {
             if ("-1".equals(templateId)) {
-                selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid".split(","));
+                //selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid".split(","));
+                selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_subcompanyid1,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid,-1_hrm_sporder".split(","));
             } else {
                 searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
                 selectKeys = getSelectKeys(searchTemplateById);
@@ -602,7 +603,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         }
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        List<SearchConditionGroup> allConditions = getAllConditions();
+        List<SearchConditionGroup> allConditions = getAllConditions(true);
         // 穿梭框ID，展示所选字段信息
         HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
         if ("-1".equals(templateId)) {
@@ -1000,12 +1001,15 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     }
 
 
+    public List<SearchConditionGroup> getAllConditions() {
+        return getAllConditions(false);
+    }
     /**
      * 获取所有搜索字段信息构建的高级搜索表单
      *
      * @return
      */
-    public List<SearchConditionGroup> getAllConditions() {
+    public List<SearchConditionGroup> getAllConditions(boolean isSearch) {
         HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> basicConditionItems = new ArrayList<>();
@@ -1016,7 +1020,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<CusFormFieldPO> hrmFieldsByScopeId = getSystemDataMapper().getHrmFieldsByScopeId(HrmGroupEnum.HRM_BASIC.getGroupType().toString());
         createConditionItems(hrmFieldSearchConditionComInfo, hrmFieldsByScopeId, basicConditionItems);
         if (CollectionUtils.isNotEmpty(basicConditionItems)) {
-            SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo);
+            SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo,isSearch);
             basicConditionItems.add(0,searchConditionItem);
             addGroups.add(new SearchConditionGroup(SystemEnv.getHtmlLabelName(547175, user.getLanguage()), true, basicConditionItems));
         }
@@ -1037,13 +1041,25 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         return addGroups;
     }
 
-    private SearchConditionItem buildSubCompanyCondition(HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo) {
+
+    /**
+     * 花名册构建
+     *
+     * @param hrmFieldSearchConditionComInfo
+     * @param isSearch
+     * @return
+     */
+    private SearchConditionItem buildSubCompanyCondition(HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo, boolean isSearch) {
         HrmFieldBean hrmFieldBean = new HrmFieldBean();
         hrmFieldBean.setFieldid("");
         hrmFieldBean.setFieldname("-1_hrm_subcompanyid1");
-        hrmFieldBean.setFieldlabel("-82515");
+        hrmFieldBean.setFieldlabel("-2458");
         hrmFieldBean.setFieldhtmltype("3");
-        hrmFieldBean.setType("170");
+        if (isSearch) {
+            hrmFieldBean.setType("170");
+        } else {
+            hrmFieldBean.setType("164");
+        }
         hrmFieldBean.setIsQuickSearch(false);
         hrmFieldBean.setIsScope(false);
         hrmFieldBean.setDmlurl("");
@@ -1106,7 +1122,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             List<SearchConditionItem> conditionItems = new ArrayList<>();
             for (String field : fieldNames) {
                 if ("-1_hrm_subcompanyid1".equals(field)) {
-                    SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo);
+                    SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo,true);
                     conditionItems.add(searchConditionItem);
                 } else {
                     String fieldName = field.substring(field.lastIndexOf("_") + 1);

src/com/engine/organization/transmethod/HrmResourceTransMethod.java

@@ -27,6 +27,9 @@ public class HrmResourceTransMethod {
      */
     public static String getFieldTrueValue(String id, String para) {
         HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0]));
+        if("-1_hrm_subcompanyid1".equals(para)){
+            hfm = new HrmFieldManager("HrmCustomFieldByInfoType", 5);
+        }
         String fieldName = para.substring(para.lastIndexOf("_") + 1);
         JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
         User user = new User();
@@ -78,6 +81,9 @@ public class HrmResourceTransMethod {
      */
     public static String getFieldTrueValueExp(String id, String para) {
         HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0]));
+        if("-1_hrm_subcompanyid1".equals(para)){
+            hfm = new HrmFieldManager("HrmCustomFieldByInfoType", 5);
+        }
         String fieldName = para.substring(para.lastIndexOf("_") + 1);
         JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
         User user = new User();