master

Reviewed-on: #289

src/com/api/browser/service/impl/JobBrowserService.java

@@ -25,6 +25,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
+import weaver.hrm.company.SubCompanyComInfo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -77,13 +78,14 @@ public class JobBrowserService extends BrowserService {
         Map<String, Object> apidatas = new HashMap<>();
         String q = Util.null2String(httpServletRequest.getParameter("q"));
         List<String> sqlParams = new ArrayList<>();
+        SubCompanyComInfo subInfo = new SubCompanyComInfo();
         String keyword = "";
         if (q.length() > 0) {
             keyword = "%" + q + "%";
         }
         RecordSet rs = new RecordSet();
         String sqlwhere = " where t.delete_type = 0 ";
-        String backfields = "t.id, t.job_no, h.jobtitlename as name ";
+        String backfields = "t.id,t.ec_company, t.job_no, h.jobtitlename as name ";
         String fromSql = "FROM jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id  ";
         String orderby = " order by t.id ";
         sqlwhere += "  ";
@@ -104,7 +106,8 @@ public class JobBrowserService extends BrowserService {
             Map<String, String> item = new HashMap<>(3);
             item.put("id", Util.null2String(rs.getString("id")));
             String name = Util.null2String(rs.getString("name"));
-            item.put("name", name);
+            String subCompanyname = subInfo.getSubCompanyname(Util.null2String(rs.getString("ec_company")));
+            item.put("name", name+"("+subCompanyname+")");
             item.put("title", name);
             datas.add(item);
         }
@@ -234,7 +237,7 @@ public class JobBrowserService extends BrowserService {
                     compList = MapperProxyFactory.getProxy(CompMapper.class).listParent();
                 }
                 // 获取顶层分部
-                compList.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item));
+                compList.stream().sorted(Comparator.comparingDouble(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item));
             } else if ("1".equals(params.getType())) {
                 // 当前节点下的元素
                 CompPO compBuild = CompPO.builder().supSubComId(Integer.parseInt(params.getId())).canceled(0).build();

src/com/engine/organization/entity/chart/StatisticsVO.java

@@ -1,6 +1,5 @@
 package com.engine.organization.entity.chart;
 
-import com.icbc.api.internal.apache.http.impl.cookie.S;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/com/engine/organization/entity/company/bo/CompBO.java

@@ -24,7 +24,10 @@ public class CompBO {
     }
 
     public static List<SearchTree> buildSetToSearchTree(Set<CompPO> comps) {
-        return comps.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).map(item -> {
+        return comps.stream().sorted(Comparator
+                .comparingDouble(CompPO::getShowOrder)
+                .thenComparingDouble(CompPO::getShowOrderOfTree)
+        ).map(item -> {
             SearchTree tree = new SearchTree();
             tree.setCanClick(true);
             tree.setCanceled(item.getCanceled() != null && item.getCanceled() != 0);
@@ -37,6 +40,7 @@ public class CompBO {
             tree.setSelected(false);
             tree.setType("1");
             tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
+            tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree());
             return tree;
         }).collect(Collectors.toList());
     }

src/com/engine/organization/entity/company/dto/CompListDTO.java

@@ -59,7 +59,7 @@ public class CompListDTO {
 
 
     @TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
-    private Integer showOrder;
+    private Double showOrder;
 
     /**
      * 禁用标记
@@ -78,8 +78,8 @@ public class CompListDTO {
      */
     private List<CompListDTO> children;
 
-    public Integer getShowOrder() {
-        return null == showOrder ? 0 : showOrder;
+    public Double getShowOrder() {
+        return null == showOrder ? 0.00 : showOrder;
     }
 
     private String orderType;
@@ -89,9 +89,9 @@ public class CompListDTO {
             return children;
         }
         if ("asc".equalsIgnoreCase(orderType)) {
-            return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList());
         } else {
-            return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
         }
     }
 }

src/com/engine/organization/entity/company/param/CompParam.java

@@ -25,6 +25,6 @@ public class CompParam extends BaseQueryParam {
     private String outKey;
     private Integer limitUsers;
     private String uuid;
-    private Integer showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrder;
+    private Double showOrderOfTree;
 }

src/com/engine/organization/entity/company/po/CompPO.java

@@ -32,6 +32,20 @@ public class CompPO {
     private Date modified;
     private Integer modifier;
     private String uuid;
-    private Integer showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrder;
+    private Double showOrderOfTree;
+
+    public Double getShowOrder() {
+        if (null == showOrder) {
+            return 0.00;
+        }
+        return showOrder;
+    }
+
+    public Double getShowOrderOfTree() {
+        if (null == showOrderOfTree) {
+            return 0.00;
+        }
+        return showOrderOfTree;
+    }
 }

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -171,8 +171,9 @@ public class DepartmentBO {
             tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString());
             tree.setSelected(false);
             tree.setType("2");
-            tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString());
-            tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue());
+            tree.setParentComp(null == item.getSubCompanyId1() ? "0" : item.getSubCompanyId1().toString());
+            tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue());
+            tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0.00 : item.getShowOrderOfTree());
             return tree;
         }).collect(Collectors.toList());
     }

src/com/engine/organization/entity/department/dto/DepartmentListDTO.java

@@ -36,7 +36,7 @@ public class DepartmentListDTO {
     /**
      * 名称
      */
-    @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
+    @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
     private String departmentMark;
 
     /**
@@ -48,7 +48,7 @@ public class DepartmentListDTO {
     /**
      * 简称
      */
-    @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentName", key = "departmentName")
+    @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
 
     /**
@@ -105,9 +105,9 @@ public class DepartmentListDTO {
             return children;
         }
         if ("asc".equalsIgnoreCase(orderType)) {
-            return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
         } else {
-            return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
         }
     }
 }

src/com/engine/organization/entity/department/param/DeptSearchParam.java

@@ -28,5 +28,5 @@ public class DeptSearchParam extends BaseQueryParam {
 
     private String uuid;
     private Double showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrderOfTree;
 }

src/com/engine/organization/entity/department/po/DepartmentPO.java

@@ -35,6 +35,6 @@ public class DepartmentPO {
     private Integer modifier;
     private String uuid;
     private Double showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrderOfTree;
 
 }

src/com/engine/organization/entity/hrmresource/po/ResourcePO.java

@@ -27,7 +27,7 @@ public class ResourcePO {
     private Integer jobtitle;
 
     private String lastName;
-    private Integer dspOrder;
+    private Double dspOrder;
 
     /**
      * 临时关联聚才林岗位ID

src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java

@@ -33,7 +33,7 @@ import lombok.NoArgsConstructor;
                 " left join HRMJOBTITLES t3 on t.JOBTITLE=t3.id" +
                 " left join HRMJOBACTIVITIES t4 on t3.JOBACTIVITYID=t4.ID" +
                 " left join HRMJOBGROUPS t5 on t4.JOBGROUPID=t5.ID ",
-        orderby = " t.dsporder ",
+        orderby = " t.dsporder",
         sortway = " asc",
         primarykey = "id",
         operates = {

src/com/engine/organization/entity/job/bo/JobBO.java

@@ -156,7 +156,7 @@ public class JobBO {
             tree.setSelected(false);
             tree.setType("3");
             tree.setParentComp(null == item.getEcDepartment() ? "0" : item.getEcDepartment().toString());
-            tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
+            tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder());
             return tree;
         }).collect(Collectors.toList());
 

src/com/engine/organization/entity/job/dto/JobListDTO.java

@@ -89,6 +89,8 @@ public class JobListDTO {
     //@TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag")
     //private Integer forbiddenTag;
 
+
+
     /**
      * 操作列
      */

src/com/engine/organization/entity/job/param/JobSearchParam.java

@@ -75,7 +75,7 @@ public class JobSearchParam extends BaseQueryParam {
     /**
      * 显示顺序
      */
-    private Integer showOrder;
+    private Double showOrder;
 
     private Integer subcompanyid1;
 

src/com/engine/organization/entity/job/po/JobPO.java

@@ -87,7 +87,7 @@ public class JobPO {
     /**
      * 显示顺序
      */
-    private Integer showOrder;
+    private Double showOrder;
 
     private String gradeId;
 

src/com/engine/organization/entity/searchtree/SearchTree.java

@@ -18,7 +18,8 @@ public class SearchTree extends TreeNode {
     private boolean isCanceled;
     private String requestParams;
     private String parentComp;
-    private Integer orderNum;
+    private Double orderNum;
+    private Double showOrderOfTree;
 
     public String getCompanyid() {
         return companyid;
@@ -76,14 +77,28 @@ public class SearchTree extends TreeNode {
         this.parentComp = parentComp;
     }
 
-    public Integer getOrderNum() {
+    public Double getOrderNum() {
+        if(null==orderNum){
+            return 0.00;
+        }
         return orderNum;
     }
 
-    public void setOrderNum(Integer orderNum) {
+    public void setOrderNum(Double orderNum) {
         this.orderNum = orderNum;
     }
 
+    public Double getShowOrderOfTree() {
+        if(null==showOrderOfTree){
+            return 0.00;
+        }
+        return showOrderOfTree;
+    }
+
+    public void setShowOrderOfTree(Double showOrderOfTree) {
+        this.showOrderOfTree = showOrderOfTree;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/com/engine/organization/mapper/department/DepartmentMapper.xml

@@ -12,6 +12,7 @@
         <result column="departmentCode" property="departmentCode"/>
         <result column="coadjutant" property="coadjutant"/>
         <result column="showOrder" property="showOrder"/>
+        <result column="showOrderOfTree" property="showOrderOfTree"/>
         <result column="uuid" property="uuid"/>
     </resultMap>
 
@@ -30,6 +31,7 @@
         t.departmentCode,
         t.coadjutant,
         t.showOrder,
+        t.showOrderOfTree,
         t.uuid
     </sql>
 

src/com/engine/organization/mapper/job/JobMapper.java

@@ -130,7 +130,7 @@ public interface JobMapper {
      *
      * @return
      */
-    Integer getMaxShowOrder();
+    Double getMaxShowOrder();
 
     /**
      * 根据名字和上级查询岗位信息

src/com/engine/organization/mapper/job/JobMapper.xml

@@ -467,7 +467,7 @@
             and t.forbidden_tag = #{jobPO.forbiddenTag}
         </if>
     </select>
-    <select id="getMaxShowOrder" resultType="java.lang.Integer">
+    <select id="getMaxShowOrder" resultType="java.lang.Double">
         select max(show_order)
         from jcl_org_job
     </select>

src/com/engine/organization/mapper/resource/HrmResourceMapper.xml

@@ -22,7 +22,7 @@
     <select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
         select distinct a.subcompanyid1, a.departmentid, a.jobtitle
         from hrmresource a
-        where a.status &lt; 4
+        where a.status &lt; 4 and a.seclevel &gt;= 0
           and not exists
             (select 1
              from jcl_org_job b

src/com/engine/organization/service/ChartService.java

@@ -100,7 +100,7 @@ public interface ChartService {
      * @param: []
      * @return: java.util.Map<java.lang.Integer,com.engine.organization.entity.chart.HrmLabelVO>
      */
-    Map<Integer, HrmLabelVO> selectLabel();
+    Map<String, HrmLabelVO> selectLabel();
 
     /**
      * @Description: 历史版本删除

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

@@ -60,8 +60,9 @@ public class CardAccessServiceImpl extends Service implements CardAccessService
     @Override
     public Map<String, Object> hasRight() {
         Map<String, Object> resultMap = new HashMap<>();
-        boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
-        resultMap.put("hasRight", hasRight);
+        //boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
+        //脚本未找到该菜单 放开所有
+        resultMap.put("hasRight", true);
         return resultMap;
     }
 

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

@@ -715,9 +715,9 @@ public class ChartServiceImpl extends Service implements ChartService {
     }
 
     @Override
-    public Map<Integer, HrmLabelVO> selectLabel() {
+    public Map<String, HrmLabelVO> selectLabel() {
         RecordSet rs = new RecordSet();
-        Map<Integer, HrmLabelVO> labelData = new HashMap<>();
+        Map<String, HrmLabelVO> labelData = new HashMap<>();
         //labelId集合
         List<Integer> labelIds = Arrays.asList(547190,547194,547196,547262,547282,547283,547284,547285,547286,547287,547292,547293,547294,547296,547298,547299,547300,547301,547302,547303,547304,547305,547307,547310,547313,547314,547315,547316,547317,
                 547318,547319,547320,547321,547322,547323,547324,547326,547327,547328,547329,547330,547331,547332,547333,547334,547345,547346,547447,547448,547468,547473,547475,547476,547477,547478,547478,547264,547265,547463,547464,547465,
@@ -726,7 +726,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         labelIds.forEach(item -> {
             rs.executeQuery("select labelName from HtmlLabelInfo where indexid = ? and languageid = ?",item,user.getLanguage());
             if (rs.next()){
-                labelData.put(item,HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
+                labelData.put(Util.null2String(item),HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
             }
 
         });
@@ -1007,7 +1007,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 ";
             deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1  as subcompanyid, " +
                     "b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," +
-                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " +
+                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,d.bmfzr as fleader,e.on_job_num,e.staff_num " +
                     "from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " +
                     "left join hrmdepartment c on a.supdepid = c.id " +
                     "left join hrmdepartmentdefined d on a.id=d.deptid " +
@@ -1040,12 +1040,13 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "               a.departmentcode,\n" +
                     "               a.coadjutant,\n" +
                     "               a.tlevel,\n" +
-                    "               a.bmfzr          as fleader,\n" +
+                    "               e.bmfzr          as fleader,\n" +
                     "               d.on_job_num,\n" +
                     "               d.staff_num" +
                     "        from hrmdepartment a\n" +
                     "                 left join hrmsubcompany b on a.subcompanyid1 = b.id\n" +
                     "                 left join hrmdepartment c on a.supdepid = c.id\n" +
+                    "                 left join hrmdepartmentdefined e on a.id=e.deptid\n" +
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=2 ";
         }
 
@@ -1671,9 +1672,6 @@ public class ChartServiceImpl extends Service implements ChartService {
      * @return 人员名称
      */
     private String getDepartmentLeader(String ids) {
-        if (!isRealTime) {
-            return ids;
-        }
         if (StringUtils.isBlank(ids)) {
             return "";
         }

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

@@ -85,10 +85,10 @@ public class CompServiceImpl extends Service implements CompService {
             // 添加父级元素
             List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs, orderType.toString());
             if ("asc".equalsIgnoreCase(orderType.toString())) {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList());
 
             } else {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
             pageInfos = new PageInfo<>(user, subList, CompListDTO.class);

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

@@ -48,7 +48,7 @@ public class ConfigServiceImpl extends Service implements ConfigService {
     public String ssoLogin(QTXConfigParam qtx) throws UnsupportedEncodingException {
         String hkUrl;
         BaseBean bb = new BaseBean();
-        String enable = bb.getPropValue("qtx_sso_login", "enable");
+        String enable = bb.getPropValue("hrmOrganization", "enable");
         String userAgent = qtx.getUserAgent();
         boolean termianal = MobileTerminalEnum.containsEnumValue(userAgent);
         if (VALUE_ONE.equals(enable)) {
@@ -83,7 +83,7 @@ public class ConfigServiceImpl extends Service implements ConfigService {
         if (Objects.nonNull(qtxConfigPO)) {
             BeanUtils.copyProperties(datas, qtxConfigPO);
         }
-        map.put("isopenconfig",bb.getPropValue("qtx_sso_login","enable"));
+        map.put("isopenconfig",bb.getPropValue("hrmOrganization","enable"));
         map.put("columns",columns);
         map.put("datas", Collections.singletonList(datas));
         return map;
@@ -93,7 +93,7 @@ public class ConfigServiceImpl extends Service implements ConfigService {
     @Override
     public int saveConfigInfo(QTXConfigPO qtxConfigPO, String isopenconfig) {
         ConfigOperator ConfigOperator = new ConfigOperator();
-        ConfigOperator.setProp("qtx_sso_login.properties", "enable", isopenconfig);
+        ConfigOperator.setProp("hrmOrganization.properties", "enable", isopenconfig);
         qtxConfigPO.setCreator(user.getUID());
         qtxConfigPO.setCreateDate(OrganizationDateUtil.getFormatLocalDate(LocalDate.now()));
         getConfigMapper().deleteAll();

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

@@ -134,10 +134,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             // 添加父级元素
             List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs, orderType.toString());
             if ("asc".equalsIgnoreCase(orderType.toString())) {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
 
             } else {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
             pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);

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

@@ -63,7 +63,10 @@ import weaver.general.BaseBean;
 import weaver.general.StringUtil;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
 import weaver.hrm.definedfield.HrmFieldManager;
+import weaver.hrm.privacy.PrivacyComInfo;
 import weaver.systeminfo.SystemEnv;
 
 import java.math.BigDecimal;
@@ -186,25 +189,40 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
         }
         List<SearchConditionItem> items = filterByDomkey(all, columnList);
+        List<String> privacyList = Arrays.asList("-1_hrm_mobile","-1_hrm_telephone","-1_hrm_mobilecall","-1_hrm_fax","-1_hrm_email");
         for (SearchConditionItem item : items) {
             String columnName = item.getDomkey()[0];
             WeaTableColumn weaTableColumn = new WeaTableColumn();
 
             if (columnName.equals("-1_cus_"+propValue)){
+                weaTableColumn.setOtherpara(columnName);
                 fields.add("t.id as " + buildTableSql(columnName).replace(".", "_"));
                 weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValue");
+            }else if(privacyList.contains(columnName)) {
+                fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
+                PrivacyComInfo pc = new PrivacyComInfo();
+                Map<String, String> mapShowSets = pc.getMapShowSets();
+                String[] parts = columnName.split("_");
+                String fieldName = parts[parts.length - 1];
+                if (mapShowSets != null && mapShowSets.get("mobile") != null) {
+                    weaTableColumn.setOtherpara("column:id+" + user.getUID() + "+"+fieldName+"");
+                    weaTableColumn.setTransmethod("weaver.hrm.privacy.PrivacyComInfo.getSearchContent");
+                }else {
+                    weaTableColumn.setOtherpara(fieldName+":"+user.getLanguage());
+                    weaTableColumn.setTransmethod("weaver.hrm.HrmTransMethod.getDefineContent");
+                }
 
-            }else{
+            } else{
+                weaTableColumn.setOtherpara(columnName);
                 fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
                 weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
             }
-
             String scopeId = columnName.split("_")[0];
             String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
 
             weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId, user.getLanguage()));
             weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
-            weaTableColumn.setOtherpara(columnName);
+
             weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
             weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
             weaTableColumnList.add(weaTableColumn);
@@ -215,6 +233,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         weaTableColumn.setColumn("id");
         weaTableColumn.setDisplay(WeaBoolAttr.FALSE);
 
+
         weaTableColumnList.add(weaTableColumn);
         fields.add("t.id");
         table.setBackfields(StringUtils.join(fields, ","));
@@ -643,6 +662,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         btnDatas.put("rightMenu", rightMenuList);
         btnDatas.put("hasRight", true);
         btnDatas.put("loginId", user.getUID());
+        btnDatas.put("cardType", new BaseBean().getPropValue("hrmOrganization", "cardType"));
         //获取当前用户使用的列定制模板Id
         btnDatas.put("customTemplateId", getCustomTemplateId());
         btnDatas.put("searchTemplateId", getSearchTemplateId());
@@ -785,9 +805,14 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         createConditionItems(hrmFieldSearchConditionComInfo, hrmFieldsByScopeId, conditionItems);
         Map<String, SearchConditionItem> allFieldsMap = conditionItems.stream().collect(Collectors.toMap(item -> item.getDomkey()[0], item -> item, (k1, k2) -> k1));
         boolean isQuickSearch = "true".equals(Util.null2String(params.get("isQuickSearch")));
+        DepartmentComInfo deptInfo = new DepartmentComInfo();
+        SubCompanyComInfo subInfo = new SubCompanyComInfo();
 
         DBType dbType = DBType.get(new RecordSet().getDBType());
         StringBuilder sb = new StringBuilder(" where 1=1 ");
+        // 默认去除外部人员显示
+        sb.append( " and t.seclevel >= 0 ");
+
         if (params.containsKey("lastName") || !params.containsKey("-1_hrm_status")) {
             // sb.append(" and t.status = 1");
             sb.append(" and t.status < 4");
@@ -809,10 +834,18 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                 sb.append(" and t.lastname ").append(dbType.like(value));
             }
             if ("companyId".equals(key)) {
-                sb.append(" and t.subcompanyid1 ='").append(value).append("'");
+                ArrayList<Integer> list = new ArrayList<>();
+                list.add(Integer.parseInt(value));
+                subInfo.getSubCompanyLists(value,list);
+                String allSub = StringUtils.join(list,",");
+                sb.append(" and t.subcompanyid1 in(").append(allSub).append(")");
             }
             if ("departmentId".equals(key)) {
-                sb.append(" and t.departmentId ='").append(value).append("'");
+                ArrayList<Integer> list = new ArrayList<>();
+                list.add(Integer.parseInt(value));
+                deptInfo.getAllChildDeptByDepId(list,value);
+                String allDept = StringUtils.join(list,",");
+                sb.append(" and t.departmentId in (").append(allDept).append(")");
             }
             if ("jobTitle".equals(key)) {
                 JobPO jobById = getJobMapper().getJobById(Long.parseLong(value));
@@ -1280,7 +1313,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
             case BROWSER://浏览按钮
                 // 兼容多选浏览按钮
-                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like(value));
+                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like("," + value + ","));
                 break;
 
             case INPUTNUMBER:// 数字

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

@@ -164,10 +164,10 @@ public class JobServiceImpl extends Service implements JobService {
             // 添加父级元素
             List<JobListDTO> jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs);
             if ("asc".equalsIgnoreCase(orderType.toString())) {
-                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder)).collect(Collectors.toList());
+                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder)).collect(Collectors.toList());
 
             } else {
-                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
             pageInfos = new PageInfo<>(user, subList, JobListDTO.class);
@@ -367,9 +367,9 @@ public class JobServiceImpl extends Service implements JobService {
         }
 
         if (StringUtils.isBlank(params.get("show_order").toString())) {
-            Integer maxShowOrder = getJobMapper().getMaxShowOrder();
+            Double maxShowOrder = getJobMapper().getMaxShowOrder();
             if (null == maxShowOrder) {
-                maxShowOrder = 0;
+                maxShowOrder = 0.00;
             }
             params.put("show_order", maxShowOrder + 1);
         }
@@ -433,8 +433,8 @@ public class JobServiceImpl extends Service implements JobService {
         OrganizationAssert.notBlank(department, SystemEnv.getHtmlLabelName(547423,user.getLanguage()));
         int insertCount = 0;
         List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
-        Integer orderNum = getJobMapper().getMaxShowOrder();
-        orderNum = null == orderNum ? 0 : orderNum;
+        Double orderNum = getJobMapper().getMaxShowOrder();
+        orderNum = null == orderNum ? 0.00 : orderNum;
         for (Long id : idList) {
             orderNum++;
             JobPO jobById = getJobMapper().getJobById(id);

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

@@ -27,8 +27,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
-import weaver.hrm.cachecenter.bean.RolemembersComInfo;
-import weaver.hrm.resource.ResourceComInfo;
 import weaver.hrm.roles.RolesComInfo;
 import weaver.systeminfo.SystemEnv;
 
@@ -233,7 +231,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         }
         String ecRolelevel = (String) params.get("ecRolelevel");
         if (StringUtils.isNotBlank(ecRolelevel)) {
-            sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like(ecRolelevel);
+            sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like("," + ecRolelevel + ",");
         }
         return sqlWhere;
     }

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

@@ -611,9 +611,15 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         Map<String, Object> datas = new HashMap<>();
         RecordSet rs = new RecordSet();
         String fclass = Util.null2String(params.get("fclass"));
+        String timeName = Util.null2String(params.get("timeName"));
         List<TimeLinesBO> timeLinesBOList = new ArrayList<>();
         timeLinesBOList.add(TimeLinesBO.builder().key(0).id(0).title("当前版本").color("blue").time("").build());
-        rs.executeQuery("SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ? order by id desc", fclass, 0);
+        String sql = "SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ?";
+        if (StringUtils.isNotEmpty(timeName)) {
+            sql += " and description like '%"+timeName+"%'";
+        }
+        sql += " order by id desc";
+        rs.executeQuery(sql, fclass, 0);
         while (rs.next()) {
             timeLinesBOList.add(TimeLinesBO.builder()
                     .key(rs.getInt("id"))

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

@@ -845,7 +845,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
             jobPO.setDescription(description);
             jobPO.setWorkDuty(work_duty);
             jobPO.setWorkAuthority(work_authority);
-            jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Integer.parseInt(show_order));
+            jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Double.parseDouble(show_order));
             jobPO.setForbiddenTag(StringUtils.isBlank(forbidden_tag) ? null : Integer.parseInt(forbidden_tag));
             jobPO.setGradeId(grade_id);
             jobPO.setLevelId(level_id);

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

@@ -236,6 +236,8 @@ public class StaffInfoImportUtil {
                                     OrgImportUtil.saveImportDetailLog(historyDetailPO);
                                     continue nextRow;
                                 }
+                                parentJobId = jobPList.get(0).getId();
+
                             }
                         }
                         map.put("job_id", parentJobId);
@@ -292,7 +294,7 @@ public class StaffInfoImportUtil {
                     break;
                 case "3": // 岗位
                     if (null == parentJobId) {
-                        checkMsg = "编制维度选择岗位时，岗位必填！";
+                        checkMsg = "编制维度选择岗位时，未找到对应岗位！";
                     } else {
                         JobPO jobPO = MapperProxyFactory.getProxy(JobMapper.class).getJobById(parentJobId);
                         if (null == jobPO) {

src/com/engine/organization/util/tree/SearchTreeUtil.java

@@ -91,7 +91,11 @@ public class SearchTreeUtil {
         Set<String> leafIds = new HashSet<>();
         List<SearchTree> collect = treeList.stream().peek(e -> {
             if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) {
-                List<TreeNode> nodes = collects.get(e.getId()).stream().sorted(Comparator.comparing(item -> null == item.getOrderNum() ? 0 : item.getOrderNum())).collect(Collectors.toList());
+                List<TreeNode> nodes = collects.get(e.getId()).stream().sorted(Comparator
+                                .comparingDouble(SearchTree::getOrderNum)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
+                        )
+                        .collect(Collectors.toList());
                 e.setSubs(nodes);
                 leafIds.add(e.getId());
                 if (CollectionUtils.isNotEmpty(e.getSubs())) {
@@ -110,18 +114,25 @@ public class SearchTreeUtil {
      * @return
      */
     public static List<SearchTree> builderTreeMode(List<SearchTree> treeList, List<SearchTree> deptTrees) {
-        Map<String, List<TreeNode>> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid));
+        Map<String, List<SearchTree>> parentMap = treeList.stream().collect(Collectors.groupingBy(SearchTree::getPid));
         Map<String, List<SearchTree>> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp));
         boolean isAdd = !childMap.isEmpty();
         Set<String> leafIds = new HashSet<>();
         List<SearchTree> collect = treeList.stream().peek(e -> {
             Set<TreeNode> treeNodes = new LinkedHashSet<>();
             if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) {
-                List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
+                List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(
+                        Comparator.comparingDouble(SearchTree::getOrderNum)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
+                ).collect(Collectors.toList());
                 treeNodes.addAll(searchTrees);
             }
-            List<TreeNode> nodes = parentMap.get(e.getId());
+            List<SearchTree> nodes = parentMap.get(e.getId());
             if (CollectionUtils.isNotEmpty(nodes)) {
+                nodes = nodes.stream().sorted(
+                        Comparator.comparingDouble(SearchTree::getOrderNum)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
+                ).collect(Collectors.toList());
                 treeNodes.addAll(nodes);
             }
             e.setSubs(new ArrayList<>(treeNodes));

src/com/engine/organization/wrapper/OrgChartWrapper.java

@@ -91,7 +91,7 @@ public class OrgChartWrapper extends Service {
         return getChartService(user).recordStatistics(param);
     }
 
-    public Map<Integer, HrmLabelVO> selectLabel() {
+    public Map<String, HrmLabelVO> selectLabel() {
         return getChartService(user).selectLabel();
     }