Merge pull request '分部列表、新增、删除、转移功能重写' (#77) from feature/dxf into develop

Reviewed-on: #77

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

@@ -0,0 +1,130 @@
+package com.engine.organization.entity.company.bo;
+
+import com.engine.organization.entity.company.dto.CompanyListDTO;
+import com.engine.organization.entity.company.param.CompanyParam;
+import com.engine.organization.entity.company.po.CompanyPO;
+import com.engine.organization.mapper.comp.CompanyMapper;
+import com.engine.organization.util.db.MapperProxyFactory;
+import org.apache.commons.collections.CollectionUtils;
+import weaver.general.Util;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/11/24
+ * @version: 1.0
+ */
+public class CompanyBO {
+
+    private static CompanyMapper getCompanyMapper() {
+        return MapperProxyFactory.getProxy(CompanyMapper.class);
+    }
+
+    /**
+     * 搜索条件转换实体对象
+     *
+     * @param param
+     * @param userId
+     * @return
+     */
+    public static CompanyPO convertParamToPO(CompanyParam param, Integer userId) {
+        if (null == param) {
+            return null;
+        }
+        return CompanyPO
+                .builder()
+                .id(param.getId() == null ? 0 : param.getId())
+                .subCompanyName(param.getSubCompanyName())
+                .subCompanyDesc(param.getSubCompanyDesc())
+                // 所属集团默认为1
+                .companyId(null == param.getCompanyId() ? 1 : param.getCompanyId())
+                .supSubComId(param.getSupSubComId())
+                .url(param.getUrl())
+                .canceled(param.getCanceled() == null ? null : param.getCanceled() ? 0 : 1)
+                .subCompanyCode(param.getSubCompanyCode())
+                .outKey(param.getOutKey())
+                .limitUsers(null == param.getLimitUsers() ? 0 : param.getLimitUsers())
+                .uuid(param.getUuid())
+                .showOrder(param.getShowOrder())
+                .showOrderOfTree(param.getShowOrderOfTree())
+                .created(new Date())
+                .creater(userId)
+                .modified(new Date())
+                .modifier(userId)
+                .build();
+    }
+
+    public static List<CompanyListDTO> buildCompDTOList(Collection<CompanyPO> list, List<CompanyPO> filterList) {
+        // 搜索结果为空，直接返回空
+        if (CollectionUtils.isEmpty(filterList)) {
+            return Collections.emptyList();
+        }
+        // 递归添加父级数据
+        Map<Integer, CompanyPO> poMaps = list.stream().collect(Collectors.toMap(CompanyPO::getId, item -> item));
+        List<CompanyPO> addedList = new ArrayList<>();
+        for (CompanyPO po : filterList) {
+            dealParentData(addedList, po, poMaps);
+        }
+
+        return buildCompDTOList(addedList);
+    }
+
+    public static List<CompanyListDTO> buildCompDTOList(List<CompanyPO> list) {
+
+        Map<Integer, CompanyPO> poMaps = list.stream().collect(Collectors.toMap(CompanyPO::getId, item -> item));
+
+        List<CompanyListDTO> dtoList = list.stream().map(e ->
+                CompanyListDTO
+                        .builder()
+                        .id(e.getId())
+                        .subCompanyCode(e.getSubCompanyCode())
+                        .subCompanyDesc(e.getSubCompanyDesc())
+                        .subCompanyName(e.getSubCompanyName())
+                        .supSubComId(e.getSupSubComId())
+                        .supSubComName(null == poMaps.get(e.getSupSubComId()) ? "" : poMaps.get(e.getSupSubComId()).getSubCompanyName())
+                        .showOrder(e.getShowOrder())
+                        .canceled(null == e.getCanceled() ? 0 : e.getCanceled())
+                        .build()).collect(Collectors.toList());
+        Map<Integer, List<CompanyListDTO>> collects = dtoList.stream().filter(item -> 0 != item.getSupSubComId()).collect(Collectors.groupingBy(CompanyListDTO::getSupSubComId));
+        // 处理被引用数据
+        List<String> usedIds = getCompanyMapper().listUsedId();
+        // 兼容MySQL
+        usedIds.addAll(getCompanyMapper().listUsedIds());
+        List<String> collect = Arrays.stream(String.join(",", usedIds).split(",")).collect(Collectors.toList());
+        Set<Integer> leafs = new HashSet<>();
+        List<CompanyListDTO> collectTree = dtoList.stream().peek(e -> {
+            List<CompanyListDTO> childList = collects.get(e.getId());
+            leafs.add(e.getId());
+            if (CollectionUtils.isNotEmpty(childList)) {
+                e.setChildren(childList);
+                e.setIsUsed(1);
+            } else {
+                if (collect.contains(Util.null2String(e.getId()))) {
+                    e.setIsUsed(1);
+                } else {
+                    e.setIsUsed(0);
+                }
+            }
+        }).collect(Collectors.toList());
+        return collectTree.stream().filter(item -> !leafs.contains(item.getSupSubComId())).collect(Collectors.toList());
+    }
+
+    /**
+     * 递归获取查询后数据的父级数据
+     *
+     * @param addedList
+     * @param po
+     * @param poMaps
+     */
+    private static void dealParentData(List<CompanyPO> addedList, CompanyPO po, Map<Integer, CompanyPO> poMaps) {
+        if (!addedList.contains(po)) {
+            addedList.add(po);
+        }
+        CompanyPO parentCompPO = poMaps.get(po.getSupSubComId());
+        if (null != parentCompPO) {
+            dealParentData(addedList, parentCompPO, poMaps);
+        }
+    }
+}

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

@@ -0,0 +1,77 @@
+package com.engine.organization.entity.company.dto;
+
+import com.engine.organization.annotation.OrganizationTable;
+import com.engine.organization.annotation.TableTitle;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/11/24
+ * @version: 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@OrganizationTable(pageId = "dcfd9d27-6ba2-11ed-996a-00ffcbed7508")
+public class CompanyListDTO {
+    /**
+     * 主键id
+     */
+    private Integer id;
+    /**
+     * 是否被引用
+     */
+    private Integer isUsed;
+    /**
+     * 名称
+     */
+    @TableTitle(title = "名称", dataIndex = "subCompanyDesc", key = "subCompanyDesc")
+    private String subCompanyDesc;
+
+    /**
+     * 编号
+     */
+    @TableTitle(title = "编号", dataIndex = "subCompanyCode", key = "subCompanyCode")
+    private String subCompanyCode;
+
+    /**
+     * 简称
+     */
+    @TableTitle(title = "简称", dataIndex = "subCompanyName", key = "subCompanyName")
+    private String subCompanyName;
+
+    /**
+     * 上级公司
+     */
+    @TableTitle(title = "上级分部", dataIndex = "supSubComName", key = "supSubComName")
+    private String supSubComName;
+
+    private Integer supSubComId;
+
+
+    @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
+    private Integer showOrder;
+
+    /**
+     * 禁用标记
+     */
+    @TableTitle(title = "是否启用", dataIndex = "canceled", key = "canceled")
+    private Integer canceled;
+
+    /**
+     * 操作列
+     */
+    @TableTitle(title = "", dataIndex = "operate", key = "operate")
+    private String operate;
+
+    /**
+     * 子节点
+     */
+    private List<CompanyListDTO> children;
+}

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

@@ -0,0 +1,32 @@
+package com.engine.organization.entity.company.param;
+
+import com.engine.organization.common.BaseQueryParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/11/24
+ * @version: 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyParam extends BaseQueryParam {
+    private Integer Id;
+    private String subCompanyName;
+    private String subCompanyDesc;
+    private Integer companyId;
+    private Integer supSubComId;
+    private String url;
+    private Boolean canceled;
+    private String subCompanyCode;
+    private String outKey;
+    private Integer limitUsers;
+    private String uuid;
+    private Integer showOrder;
+    private Integer showOrderOfTree;
+}

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

@@ -0,0 +1,37 @@
+package com.engine.organization.entity.company.po;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/11/24
+ * @version: 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyPO {
+    private Integer id;
+    private String subCompanyName;
+    private String subCompanyDesc;
+    private Integer companyId;
+    private Integer supSubComId;
+    private String url;
+    private Integer canceled;
+    private String subCompanyCode;
+    private String outKey;
+    private Integer limitUsers;
+    private Date created;
+    private Integer creater;
+    private Date modified;
+    private Integer modifier;
+    private String uuid;
+    private Integer showOrder;
+    private Integer showOrderOfTree;
+}

src/com/engine/organization/mapper/comp/CompanyMapper.java

@@ -0,0 +1,41 @@
+package com.engine.organization.mapper.comp;
+
+import com.engine.organization.entity.company.po.CompanyPO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @description:
+ * @author:dxfeng
+ * @createTime: 2022/05/16
+ * @version: 1.0
+ */
+public interface CompanyMapper {
+    /**
+     * 列表查询
+     *
+     * @return
+     */
+    List<CompanyPO> listAll(@Param("orderSql") String orderSql);
+
+    List<CompanyPO> listByFilter(@Param("CompanyPO") CompanyPO CompanyPO, @Param("orderSql") String orderSql);
+
+    /**
+     * 查询所有被引用的ID
+     *
+     * @return
+     */
+    List<String> listUsedId();
+
+    List<String> listUsedIds();
+
+    /**
+     * 获取子层级数据
+     *
+     * @param ids
+     * @return
+     */
+    List<CompanyPO> listChild(@Param("ids") Collection<Long> ids);
+}

src/com/engine/organization/mapper/comp/CompanyMapper.xml

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.engine.organization.mapper.comp.CompanyMapper">
+    <resultMap id="BaseResultMap" type="com.engine.organization.entity.company.po.CompanyPO">
+        <result column="id" property="id"/>
+        <result column="subCompanyName" property="subCompanyName"/>
+        <result column="subCompanyDesc" property="subCompanyDesc"/>
+        <result column="companyId" property="companyId"/>
+        <result column="supSubComId" property="supSubComId"/>
+        <result column="url" property="url"/>
+        <result column="canceled" property="canceled"/>
+        <result column="subCompanyCode" property="subCompanyCode"/>
+        <result column="outKey" property="outKey"/>
+        <result column="limitUsers" property="limitUsers"/>
+        <result column="uuid" property="uuid"/>
+        <result column="showOrder" property="showOrder"/>
+        <result column="showOrderOfTree" property="showOrderOfTree"/>
+    </resultMap>
+
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+        t
+        .
+        id
+        , t.subCompanyName
+        , t.subCompanyDesc
+        , t.companyId
+        , t.supSubComId
+        , t.url
+        , t.canceled
+        , t.subCompanyCode
+        , t.outKey
+        , t.limitUsers
+        , t.uuid
+        , t.showOrder
+        , t.showOrderOfTree
+    </sql>
+
+    <select id="listAll" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM
+        hrmsubcompany t
+        order by ${orderSql}
+    </select>
+
+    <select id="listByFilter" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM
+        hrmsubcompany t
+        WHERE 1=1
+        <include refid="likeSQL"/>
+        <if test=" CompanyPO.supSubComId != null ">
+            and t.supSubComId = #{CompanyPO.supSubComId}
+        </if>
+        order by ${orderSql}
+    </select>
+
+    <select id="listUsedId" resultType="java.lang.String">
+        select SUBCOMPANYID1
+        from hrmdepartment
+        union
+        select ec_company
+        from JCL_ORG_JOB
+        where delete_type = 0
+        union
+        select ec_company
+        from JCL_ORG_STAFF
+        where delete_type = 0
+    </select>
+
+    <select id="listUsedIds" resultType="java.lang.String">
+        select ec_company
+        from JCL_ORG_STAFFPLAN
+        where delete_type = 0
+        union
+        select ec_rolelevel
+        from jcl_org_detach
+        where delete_type = 0
+    </select>
+
+    <select id="listChild" resultMap="BaseResultMap">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM
+        hrmsubcompany t
+        WHERE supsubcomid IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
+    <sql id="likeSQL">
+        <if test=" CompanyPO.subCompanyCode != null and CompanyPO.subCompanyCode != '' ">
+            and t.subCompanyCode like CONCAT('%',#{CompanyPO.subCompanyCode},'%')
+        </if>
+        <if test=" CompanyPO.subCompanyDesc != null and CompanyPO.subCompanyDesc != '' ">
+            and t.subCompanyDesc like CONCAT('%',#{CompanyPO.subCompanyDesc},'%')
+        </if>
+        <if test=" CompanyPO.subCompanyName != null and CompanyPO.subCompanyName != '' ">
+            and t.subCompanyName like CONCAT('%',#{CompanyPO.subCompanyName},'%')
+        </if>
+    </sql>
+
+    <sql id="likeSQL" databaseId="oracle">
+        <if test=" CompanyPO.subCompanyCode != null and CompanyPO.subCompanyCode != '' ">
+            and t.subCompanyCode like '%'||#{CompanyPO.subCompanyCode}||'%'
+        </if>
+        <if test=" CompanyPO.subCompanyDesc != null and CompanyPO.subCompanyDesc != '' ">
+            and t.subCompanyDesc like '%'||#{CompanyPO.subCompanyDesc}||'%'
+        </if>
+        <if test=" CompanyPO.subCompanyName != null and CompanyPO.subCompanyName != '' ">
+            and t.subCompanyName like '%'||#{CompanyPO.subCompanyName}||'%'
+        </if>
+    </sql>
+
+    <sql id="likeSQL" databaseId="sqlserver">
+        <if test=" CompanyPO.subCompanyCode != null and CompanyPO.subCompanyCode != '' ">
+            and t.subCompanyCode like '%'+#{CompanyPO.subCompanyCode}+'%'
+        </if>
+        <if test=" CompanyPO.subCompanyDesc != null and CompanyPO.subCompanyDesc != '' ">
+            and t.subCompanyDesc like '%'+#{CompanyPO.subCompanyDesc}+'%'
+        </if>
+        <if test=" CompanyPO.subCompanyName != null and CompanyPO.subCompanyName != '' ">
+            and t.subCompanyName like '%'+#{CompanyPO.subCompanyName}+'%'
+        </if>
+    </sql>
+
+</mapper>

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

@@ -2,10 +2,10 @@ package com.engine.organization.service;
 
 import com.api.browser.bean.SearchConditionGroup;
 import com.engine.organization.entity.company.param.CompSearchParam;
+import com.engine.organization.entity.company.param.CompanyParam;
 import com.engine.organization.entity.department.param.DepartmentMoveParam;
 import com.engine.organization.util.MenuBtn;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +23,7 @@ public interface CompService {
      * @param params
      * @return
      */
-    Map<String, Object> listPage(CompSearchParam params);
+    Map<String, Object> listPage(CompanyParam params);
 
     /**
      * 保存公司/分部基础信息
@@ -53,17 +53,16 @@ public interface CompService {
     /**
      * 根据ID批量删除
      *
-     * @param ids
+     * @param params
      */
-    int deleteByIds(Collection<Long> ids);
+    Map<String, Object> deleteByIds(Map<String, Object> params);
 
     /**
      * 获取搜索条件
      *
-     * @param params
      * @return
      */
-    Map<String, Object> getSearchCondition(Map<String, Object> params);
+    Map<String, Object> getSearchCondition();
 
     /**
      * 获取列表页面按钮信息
@@ -85,7 +84,7 @@ public interface CompService {
      *
      * @return
      */
-    Map<String, Object> getCompSaveForm();
+    Map<String, Object> getCompSaveForm(Map<String, Object> params);
 
     /**
      * 转移分部表单

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

@@ -4,28 +4,31 @@ package com.engine.organization.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.api.browser.bean.SearchConditionGroup;
 import com.api.browser.bean.SearchConditionItem;
-import com.api.browser.bean.SearchConditionOption;
+import com.api.hrm.bean.HrmFieldBean;
+import com.api.hrm.util.HrmFieldSearchConditionComInfo;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.cloudstore.eccom.result.WeaResultMsg;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.hrm.entity.RuleCodeType;
+import com.engine.hrm.service.impl.OrganizationServiceImpl;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.DeleteParam;
 import com.engine.organization.entity.codesetting.po.CodeRulePO;
-import com.engine.organization.entity.commom.RecordInfo;
-import com.engine.organization.entity.company.bo.CompBO;
+import com.engine.organization.entity.company.bo.CompanyBO;
 import com.engine.organization.entity.company.dto.CompListDTO;
+import com.engine.organization.entity.company.dto.CompanyListDTO;
 import com.engine.organization.entity.company.param.CompSearchParam;
+import com.engine.organization.entity.company.param.CompanyParam;
 import com.engine.organization.entity.company.po.CompPO;
+import com.engine.organization.entity.company.po.CompanyPO;
 import com.engine.organization.entity.department.param.DepartmentMoveParam;
 import com.engine.organization.entity.extend.po.ExtendTitlePO;
 import com.engine.organization.enums.LogModuleNameEnum;
 import com.engine.organization.enums.OperateTypeEnum;
 import com.engine.organization.mapper.codesetting.CodeRuleMapper;
 import com.engine.organization.mapper.comp.CompMapper;
-import com.engine.organization.mapper.extend.ExtDTMapper;
-import com.engine.organization.mapper.extend.ExtMapper;
+import com.engine.organization.mapper.comp.CompanyMapper;
 import com.engine.organization.mapper.extend.ExtendTitleMapper;
 import com.engine.organization.mapper.hrmresource.SystemDataMapper;
 import com.engine.organization.service.CompService;
@@ -34,16 +37,19 @@ import com.engine.organization.thread.OrganizationSyncEc;
 import com.engine.organization.util.*;
 import com.engine.organization.util.coderule.CodeRuleUtil;
 import com.engine.organization.util.db.MapperProxyFactory;
-import com.engine.organization.util.detach.DetachUtil;
 import com.engine.organization.util.page.Column;
 import com.engine.organization.util.page.PageInfo;
 import com.engine.organization.util.page.PageUtil;
 import com.engine.organization.util.relation.EcHrmRelationUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import weaver.general.StringUtil;
 import weaver.general.Util;
 import weaver.hrm.User;
+import weaver.hrm.company.SubCompanyComInfo;
+import weaver.hrm.definedfield.HrmDeptFieldManagerE9;
+import weaver.hrm.definedfield.HrmFieldComInfo;
+import weaver.hrm.definedfield.HrmFieldGroupComInfo;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -84,6 +90,10 @@ public class CompServiceImpl extends Service implements CompService {
      */
     private static final Long GROUP_ID = 1L;
 
+    private static CompanyMapper getCompanyMapper() {
+        return MapperProxyFactory.getProxy(CompanyMapper.class);
+    }
+
     private static CompMapper getCompMapper() {
         return MapperProxyFactory.getProxy(CompMapper.class);
     }
@@ -102,35 +112,37 @@ public class CompServiceImpl extends Service implements CompService {
 
 
     @Override
-    public Map<String, Object> listPage(CompSearchParam params) {
+    public Map<String, Object> listPage(CompanyParam params) {
         Map<String, Object> datas = new HashMap<>();
         boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
         datas.put("hasRight", hasRight);
         if (!hasRight) {
             return datas;
         }
-        CompPO compPO = CompBO.convertParamToPO(params, (long) user.getUID());
-        boolean filter = isFilter(compPO);
-        PageInfo<CompListDTO> pageInfos;
+        CompanyPO companyPO = CompanyBO.convertParamToPO(params, user.getUID());
+        boolean filter = isFilter(companyPO);
+        PageInfo<CompanyListDTO> pageInfos;
         String orderSql = PageInfoSortUtil.getSortSql(params.getSortParams());
-        List<CompPO> allList = getCompMapper().list(orderSql);
-        new DetachUtil(user.getUID()).filterCompanyList(allList);
+        List<CompanyPO> allList = getCompanyMapper().listAll(orderSql);
+
+        //TODO new DetachUtil(user.getUID()).filterCompanyList(allList);
+
         // 通过子级遍历父级元素
         if (filter) {
             // 根据条件获取元素
-            List<CompPO> filterCompPOs = getCompMapper().listByFilter(compPO, orderSql);
-            new DetachUtil(user.getUID()).filterCompanyList(filterCompPOs);
+            List<CompanyPO> filterCompPOs = getCompanyMapper().listByFilter(companyPO, orderSql);
+            //TODO new DetachUtil(user.getUID()).filterCompanyList(filterCompPOs);
 
             // 添加父级元素
-            List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs);
-            List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
-            pageInfos = new PageInfo<>(subList, CompListDTO.class);
+            List<CompanyListDTO> compListDTOS = CompanyBO.buildCompDTOList(allList, filterCompPOs);
+            List<CompanyListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
+            pageInfos = new PageInfo<>(subList, CompanyListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
         } else {
             // 组合list
-            List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList);
-            List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
-            pageInfos = new PageInfo<>(subList, CompListDTO.class);
+            List<CompanyListDTO> compListDTOS = CompanyBO.buildCompDTOList(allList);
+            List<CompanyListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
+            pageInfos = new PageInfo<>(subList, CompanyListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
         }
 
@@ -140,9 +152,7 @@ public class CompServiceImpl extends Service implements CompService {
         OrganizationWeaTable<CompListDTO> table = new OrganizationWeaTable<>(user, CompListDTO.class);
         List<Column> columns = pageInfos.getColumns();
         List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList());
-
         table.setColumns(weaTableColumn);
-
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
         result.success();
@@ -155,29 +165,10 @@ public class CompServiceImpl extends Service implements CompService {
     @Override
     public Long saveBaseComp(Map<String, Object> params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        String compNo = (String) params.get("comp_no");
-        // 判断是否开启自动编号
-        compNo = repeatDetermine(compNo);
-        params.put("comp_no", compNo);
-        if (null == params.get("show_order") || StringUtils.isBlank(params.get("show_order").toString())) {
-            Integer maxShowOrder = getCompMapper().getMaxShowOrder();
-            if (null == maxShowOrder) {
-                maxShowOrder = 0;
-            }
-            params.put("show_order", maxShowOrder + 1);
-        }
-        // 赋值上级分部
-        String ecCompany = Util.null2String(params.get("ec_company"));
-        if (StringUtils.isNotBlank(ecCompany)) {
-            params.put("parent_company", EcHrmRelationUtil.getJclCompanyId(ecCompany).getId());
-        }
         Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.ADD, params).sync();
-        String ecCompanyID = Util.null2String(syncMap.get("id"));
-        OrganizationAssert.isTrue(StringUtils.isNotBlank(ecCompanyID), syncMap.get("message").toString());
-        // 查询UUID
-        RecordInfo recordInfo = getSystemDataMapper().getHrmObjectByID(HRM_COMPANY, ecCompanyID);
-        params.put("uuid", recordInfo.getUuid());
-        return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", null);
+        String companyId = Util.null2String(syncMap.get("id"));
+        OrganizationAssert.isTrue(StringUtils.isNotBlank(companyId), syncMap.get("message").toString());
+        return Long.parseLong(companyId);
 
     }
 
@@ -228,56 +219,29 @@ public class CompServiceImpl extends Service implements CompService {
     }
 
     @Override
-    public int deleteByIds(Collection<Long> ids) {
+    public Map<String, Object> deleteByIds(Map<String, Object> params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
-        Map<String, Object> map = new HashMap<>();
-        for (Long id : ids) {
-            map.put("id", id);
-            new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.CANCELED, map).sync();
-            // 删除拓展表、明细表
-            MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_compext", id);
-            MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_compext_dt1", id, null);
-        }
-        return getCompMapper().deleteByIds(ids);
+        return ServiceUtil.getService(OrganizationServiceImpl.class, user).delSubCompany(params, user);
     }
 
     @Override
-    public Map<String, Object> getSearchCondition(Map<String, Object> params) {
+    public Map<String, Object> getSearchCondition() {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
         // 编号
-        SearchConditionItem compNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "compNo");
+        SearchConditionItem subCompanyCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "subCompanyCode");
         // 名称
-        SearchConditionItem compNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "compName");
+        SearchConditionItem subCompanyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "subCompanyDesc");
         // 简称
-        SearchConditionItem compNameShortItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "compNameShort");
+        SearchConditionItem subCompanyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "subCompanyName");
         // 上级公司
-        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级公司", "164", "ecCompany", "");
-        // 组织机构代码
-        SearchConditionItem orgCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "组织机构代码", "orgCode");
-        // 行业
-        SearchConditionItem industryItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "行业", "63", "industry", "");
-        // 负责人
-        SearchConditionItem compPrincipalItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "负责人", "1", "compPrincipal", "");
-        // 禁用标记
-        List<SearchConditionOption> selectOptions = new ArrayList<>();
-        SearchConditionOption enableOption = new SearchConditionOption("true", "启用");
-        SearchConditionOption disableOption = new SearchConditionOption("false", "禁用");
-        selectOptions.add(enableOption);
-        selectOptions.add(disableOption);
-        SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "禁用标记", "forbiddenTag");
-
-        conditionItems.add(compNoItem);
-        conditionItems.add(compNameItem);
-        conditionItems.add(compNameShortItem);
-        conditionItems.add(compBrowserItem);
-        conditionItems.add(orgCodeItem);
-        conditionItems.add(industryItem);
-        conditionItems.add(compPrincipalItem);
-        conditionItems.add(forbiddenTagItem);
+        SearchConditionItem supSubComIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "supSubComId", "");
 
+        conditionItems.add(subCompanyCodeItem);
+        conditionItems.add(subCompanyDescItem);
+        conditionItems.add(subCompanyNameItem);
+        conditionItems.add(supSubComIdItem);
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
         apiDatas.put("conditions", addGroups);
         return apiDatas;
@@ -333,20 +297,145 @@ public class CompServiceImpl extends Service implements CompService {
 
 
     @Override
-    public Map<String, Object> getCompSaveForm() {
+    public Map<String, Object> getCompSaveForm(Map<String, Object> params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         Map<String, Object> apiDatas = new HashMap<>();
-        List<SearchConditionGroup> addGroups = new ArrayList<>();
-        List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID, "1");
-        if (CollectionUtils.isNotEmpty(extendTitles)) {
-            for (ExtendTitlePO extendTitle : extendTitles) {
-                List<SearchConditionItem> items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_COMP, 2, extendTitle.getId() + "", "comp_no", RuleCodeType.SUBCOMPANY.getValue(), null);
-                if (CollectionUtils.isNotEmpty(items)) {
-                    addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
+        List<Map<String, Object>> grouplist = new ArrayList<>();
+
+        String id = Util.null2String(params.get("id"));
+        int viewAttr = Util.getIntValue(Util.null2String(params.get("viewattr")), 1);
+
+        String addType = Util.null2String(params.get("addType"));
+        SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+        String supsubcomid = "";
+        if (addType.equals("sibling")) {
+            supsubcomid = subCompanyComInfo.getSupsubcomid(id);
+        } else if (addType.equals("child")) {
+            supsubcomid = id;
+        }
+        if (StringUtils.isNotBlank(addType)) {
+            id = "";
+        }
+
+        HrmFieldGroupComInfo HrmFieldGroupComInfo = new HrmFieldGroupComInfo();
+        HrmFieldComInfo HrmFieldComInfo = new HrmFieldComInfo();
+        HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
+
+
+        HrmDeptFieldManagerE9 hfm;
+        try {
+            hfm = new HrmDeptFieldManagerE9(4);
+        } catch (Exception e) {
+            throw new RuntimeException("");
+        }
+        hfm.isReturnDecryptData(true);
+        hfm.getCustomData(Util.getIntValue(id));
+        List lsGroup = hfm.getLsGroup();
+        for (int tmp = 0; lsGroup != null && tmp < lsGroup.size(); tmp++) {
+            String groupId = (String) lsGroup.get(tmp);
+            List lsField = hfm.getLsField(groupId);
+
+            boolean groupHide = lsField.size() == 0 || hfm.getGroupCount(lsField) == 0 || !Util.null2String(HrmFieldGroupComInfo.getIsShow(groupId)).equals("1");
+            String groupLabel = HrmFieldGroupComInfo.getLabel(groupId);
+            List<Object> itemList = new ArrayList<>();
+            Map<String, Object> groupItem = new HashMap<>();
+            groupItem.put("title", SystemEnv.getHtmlLabelNames(groupLabel, user.getLanguage()));
+            groupItem.put("hide", groupHide);
+            groupItem.put("defaultshow", true);
+            for (int j = 0; j < lsField.size(); j++) {
+                String fieldId = (String) lsField.get(j);
+                String fieldName = HrmFieldComInfo.getFieldname(fieldId);
+                String isUse = HrmFieldComInfo.getIsused(fieldId);
+                if (!isUse.equals("1")) {
+                    continue;
+                }
+                int tmpViewAttr = viewAttr;
+                String rules = "";
+                String fieldLabel = HrmFieldComInfo.getLabel(fieldId);
+                String fieldHtmlType = HrmFieldComInfo.getFieldhtmltype(fieldId);
+                String type = HrmFieldComInfo.getFieldType(fieldId);
+                String dmlUrl = Util.null2String(HrmFieldComInfo.getFieldDmlurl(fieldId));
+                String fieldValue = "";
+                if (StringUtils.isNotBlank(addType)) {
+                } else {
+                    if (HrmFieldComInfo.getIssystem(fieldId).equals("1")) {
+                        fieldValue = hfm.getData(fieldName);
+                    } else {
+                        fieldValue = hfm.getData("hrmsubcompanydefined", fieldName);
+                    }
+                }
+
+                if (!groupHide && tmpViewAttr == 2 && HrmFieldComInfo.getIsmand(fieldId).equals("1")) {
+                    tmpViewAttr = 3;
+                    if ("1".equals(fieldHtmlType) && "2".equals(type)) {
+                        rules = "required|integer";
+                    } else {
+                        rules = "required|string";
+                    }
+                }
+
+                if ("84".equals(fieldId)) {
+                    if (user.getUID() != 1)
+                        continue;
+                    fieldValue = fieldValue.equals("0") ? "" : fieldValue;
+                }
+                if (supsubcomid.length() > 0 && fieldName.equals("supsubcomid")) {
+                    fieldValue = supsubcomid;
+                }
+
+                if (fieldName.equals("subshowid")) {
+                    if (StringUtils.isNotBlank(addType)) {
+                        continue;
+                    } else {
+                        fieldValue = id;
+                        tmpViewAttr = 1;
+                    }
+                }
+
+                HrmFieldBean hrmFieldBean = new HrmFieldBean();
+                hrmFieldBean.setFieldid(fieldId);
+                hrmFieldBean.setFieldname(fieldName);
+                hrmFieldBean.setFieldlabel(fieldLabel);
+                hrmFieldBean.setFieldhtmltype(fieldHtmlType);
+                hrmFieldBean.setType(type);
+                hrmFieldBean.setIsFormField(true);
+                hrmFieldBean.setFieldvalue(fieldValue);
+                hrmFieldBean.setDmlurl(dmlUrl);
+                hrmFieldBean.setViewAttr(tmpViewAttr);
+                hrmFieldBean.setRules(rules);
+                hrmFieldBean.setIssystem("1");
+                if (hrmFieldBean.getFieldname().equals("supsubcomid")) {
+                    hrmFieldBean.setHideVirtualOrg(true);
+                }
+                if (hrmFieldBean.getFieldname().equals("subcompanycode")) {
+                    hrmFieldBean.setMultilang(false);
+                }
+                SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user);
+                if (searchConditionItem != null) {
+                    searchConditionItem.setLabelcol(8);
+                    searchConditionItem.setFieldcol(16);
+                    if (hrmFieldBean.getFieldname().equals("showorder")) {
+                        searchConditionItem.setPrecision(2);
+                    }
+                    if (fieldName.equals("subshowid")) {
+                        Map<String, Object> otherParams = new HashMap<>();
+                        otherParams.put("hasBorder", true);
+                        searchConditionItem.setOtherParams(otherParams);
+                    }
+
+                    if ("6".equals(fieldHtmlType)) {//附件
+                        Map<String, Object> otherParams1 = new HashMap<>();
+                        otherParams1.put("showOrder", false);
+                        searchConditionItem.setOtherParams(otherParams1);
+                    }
+
+                    itemList.add(searchConditionItem);
                 }
             }
+            groupItem.put("items", itemList);
+            grouplist.add(groupItem);
         }
-        apiDatas.put("condition", addGroups);
+        apiDatas.put("condition", grouplist);
         return apiDatas;
 
     }
@@ -364,52 +453,33 @@ public class CompServiceImpl extends Service implements CompService {
 
     @Override
     public int moveCompany(DepartmentMoveParam moveParam) {
-        Long targetCompanyId = moveParam.getCompany();
-        //OrganizationAssert.notNull(targetCompanyId, "请选择要转移到的分部");
-        Long companyId = moveParam.getId();
+        Integer companyId = moveParam.getId().intValue();
+        Integer targetCompanyId = moveParam.getCompany().intValue();
         // 判断目标分部是否为它本身以及子元素
-        Set<Long> disableIds = new HashSet<>();
+        Set<Integer> disableIds = new HashSet<>();
         disableIds.add(companyId);
-        List<CompPO> compPOS = getCompMapper().listChild(DeleteParam.builder().ids(companyId.toString()).build().getIds());
+        List<CompanyPO> compPOS = getCompanyMapper().listChild(DeleteParam.builder().ids(companyId.toString()).build().getIds());
         if (CollectionUtils.isNotEmpty(compPOS)) {
             addDisableIds(disableIds, compPOS);
         }
         OrganizationAssert.isFalse(disableIds.contains(targetCompanyId), "请勿选择当前分部本身及其子分部");
-        CompPO compPO = getCompMapper().listById(companyId);
-        compPO.setEcCompany(targetCompanyId);
-        CompPO jclCompanyId = EcHrmRelationUtil.getJclCompanyId(Util.null2String(targetCompanyId));
-        if (null != jclCompanyId) {
-            compPO.setParentCompany(jclCompanyId.getId());
-        } else {
-            compPO.setParentCompany(null);
-        }
+
         Map<String, Object> map = new HashMap<>();
-        map.put("id", compPO.getId());
-        map.put("parent_company", compPO.getParentCompany());
-        map.put("comp_no", compPO.getCompNo());
-        map.put("comp_name_short", compPO.getCompNameShort());
-        map.put("comp_name", compPO.getCompName());
-        map.put("show_order", compPO.getShowOrder());
+        map.put("id", companyId.toString());
+        map.put("supsubcomid", targetCompanyId.toString());
         new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, map).sync();
-        return getCompMapper().updateBaseComp(compPO);
+        return companyId;
     }
 
 
     /**
      * 是否为搜索查询
      *
-     * @param compPO
+     * @param companyPO
      * @return
      */
-    private boolean isFilter(CompPO compPO) {
-        return !(StringUtil.isEmpty(compPO.getCompName())
-                && StringUtil.isEmpty(compPO.getCompNo())
-                && StringUtil.isEmpty(compPO.getCompNameShort())
-                && StringUtil.isEmpty(compPO.getOrgCode())
-                && null == compPO.getEcCompany()
-                && null == compPO.getIndustry()
-                && null == compPO.getCompPrincipal()
-                && null == compPO.getForbiddenTag());
+    private boolean isFilter(CompanyPO companyPO) {
+        return StringUtils.isNotBlank(companyPO.getSubCompanyCode()) || StringUtils.isNotBlank(companyPO.getSubCompanyDesc()) || StringUtils.isNotBlank(companyPO.getSubCompanyName()) || null != companyPO.getSupSubComId();
     }
 
 
@@ -451,10 +521,10 @@ public class CompServiceImpl extends Service implements CompService {
      * @param disableIds
      * @param compPOS
      */
-    private void addDisableIds(Set<Long> disableIds, List<CompPO> compPOS) {
-        for (CompPO compPO : compPOS) {
+    private void addDisableIds(Set<Integer> disableIds, List<CompanyPO> compPOS) {
+        for (CompanyPO compPO : compPOS) {
             disableIds.add(compPO.getId());
-            List<CompPO> childCompPOS = getCompMapper().listChild(DeleteParam.builder().ids(compPO.getId().toString()).build().getIds());
+            List<CompanyPO> childCompPOS = getCompanyMapper().listChild(DeleteParam.builder().ids(compPO.getId().toString()).build().getIds());
             addDisableIds(disableIds, childCompPOS);
         }
     }

src/com/engine/organization/thread/OrganizationSyncEc.java

@@ -447,19 +447,7 @@ public class OrganizationSyncEc {
      * 新增分部
      */
     private void addCompany() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("subcompanyname", Util.null2String(params.get("comp_name_short")));
-
-        // 上级分部通过UUID联查ec表ID
-        String ecCompany = Util.null2String(params.get("ec_company"));
-        if (StringUtils.isNotBlank(ecCompany)) {
-            map.put("supsubcomid", ecCompany);
-        }
-
-        map.put("subcompanycode", params.get("comp_no").toString());
-        map.put("subcompanydesc", params.get("comp_name").toString());
-        map.put("showorder", Util.null2String(params.get("show_order")));
-        this.resultMap = ServiceUtil.getService(OrganizationServiceImpl.class, user).addSubCompany(map, user);
+        this.resultMap = ServiceUtil.getService(OrganizationServiceImpl.class, user).addSubCompany(params, user);
     }
 
     /**
@@ -468,17 +456,8 @@ public class OrganizationSyncEc {
     private void updateCompany() {
         Map<String, Object> map = new HashMap<>();
         // 获取ec表ID
-        params.put("id", EcHrmRelationUtil.getEcCompanyId(Util.null2String(params.get("id"))));
         buildEcCompanyData(map);
-        // 上级分部通过UUID联查ec表ID
-        String parentCompany = Util.null2String(params.get("parent_company"));
-        if (StringUtils.isNotBlank(parentCompany)) {
-            map.put("supsubcomid", EcHrmRelationUtil.getEcCompanyId(parentCompany));
-        }
-        map.put("subcompanycode", Util.null2String(params.get("comp_no")));
-        map.put("subcompanyname", Util.null2String(params.get("comp_name_short")));
-        map.put("subcompanydesc", Util.null2String(params.get("comp_name")));
-        map.put("showorder", Util.null2String(params.get("show_order")));
+        map.putAll(params);
         this.resultMap = ServiceUtil.getService(OrganizationServiceImpl.class, user).editSubCompany(map, user);
     }
 
@@ -521,7 +500,7 @@ public class OrganizationSyncEc {
     }
 
     private void buildEcCompanyData(Map<String, Object> map) {
-        String ecCompanyId = EcHrmRelationUtil.getEcCompanyId(Util.null2String(params.get("id")));
+        String ecCompanyId = Util.null2String(params.get("id"));
 
         map.put("id", ecCompanyId);
         RecordSet rs = new RecordSet();

src/com/engine/organization/util/PageInfoSortUtil.java

@@ -24,11 +24,11 @@ public class PageInfoSortUtil {
         JSONArray jsonArray = JSONObject.parseArray(sortParams);
         if (CollectionUtils.isNotEmpty(jsonArray)) {
             JSONObject jsonObject = (JSONObject) jsonArray.get(0);
-            String orderKey = upperCharToUnderLine(jsonObject.getString("orderkey"));
+            String orderKey = jsonObject.getString("orderkey");
             String sortOrder = jsonObject.getString("sortOrder").replace("end", "");
             return "t." + orderKey + " " + sortOrder;
         }
-        return " show_order ";
+        return " showOrder ";
     }
 
     /**

src/com/engine/organization/web/CompController.java

@@ -4,10 +4,12 @@ import com.engine.common.util.ParamUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.organization.entity.DeleteParam;
 import com.engine.organization.entity.company.param.CompSearchParam;
+import com.engine.organization.entity.company.param.CompanyParam;
 import com.engine.organization.entity.department.param.DepartmentMoveParam;
 import com.engine.organization.util.response.ReturnResult;
 import com.engine.organization.wrapper.CompWrapper;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import org.apache.commons.lang.StringUtils;
 import weaver.hrm.HrmUserVarify;
 import weaver.hrm.User;
 
@@ -43,12 +45,12 @@ public class CompController {
     @POST
     @Path("/listComp")
     @Produces(MediaType.APPLICATION_JSON)
-    public ReturnResult listComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompSearchParam params) {
+    public ReturnResult listComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompanyParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).listPage(params));
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -88,7 +90,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -108,7 +110,7 @@ public class CompController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getCompWrapper(user).updateComp(map));
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -118,7 +120,6 @@ public class CompController {
      *
      * @param request
      * @param response
-     * @param param
      * @return
      */
     @POST
@@ -127,9 +128,11 @@ public class CompController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).deleteByIds(param.getIds()));
+            Map<String, Object> params = ParamUtil.request2Map(request);
+            params.put("id", StringUtils.join(param.getIds(), ","));
+            return ReturnResult.successed(getCompWrapper(user).deleteByIds(params));
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -146,10 +149,9 @@ public class CompController {
     public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getCompWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(getCompWrapper(user).getSearchCondition());
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -168,7 +170,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).getHasRight());
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -185,10 +187,11 @@ public class CompController {
     public ReturnResult getCompBaseForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getCompWrapper(user).getCompBaseForm(map));
+            Map<String, Object> params = ParamUtil.request2Map(request);
+            params.put("viewattr", 2);
+            return ReturnResult.successed(getCompWrapper(user).getCompSaveForm(params));
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -206,9 +209,12 @@ public class CompController {
     public ReturnResult getCompSaveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).getCompSaveForm());
+            Map<String, Object> params = ParamUtil.request2Map(request);
+            params.put("addType", "normal");
+            params.put("viewattr", 2);
+            return ReturnResult.successed(getCompWrapper(user).getCompSaveForm(params));
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -220,7 +226,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).getMoveForm());
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -232,7 +238,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).moveCompany(param));
         } catch (Exception e) {
-           return ReturnResult.exceptionHandle(e);
+            return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -5,6 +5,7 @@ import com.api.browser.bean.SearchConditionGroup;
 import com.engine.common.util.ServiceUtil;
 import com.engine.organization.annotation.Log;
 import com.engine.organization.entity.company.param.CompSearchParam;
+import com.engine.organization.entity.company.param.CompanyParam;
 import com.engine.organization.entity.company.po.CompPO;
 import com.engine.organization.entity.department.param.DepartmentMoveParam;
 import com.engine.organization.enums.LogModuleNameEnum;
@@ -18,7 +19,6 @@ import com.engine.organization.util.OrganizationWrapper;
 import com.engine.organization.util.db.MapperProxyFactory;
 import weaver.hrm.User;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +43,7 @@ public class CompWrapper extends OrganizationWrapper {
      * @param params
      * @return
      */
-    public Map<String, Object> listPage(CompSearchParam params) {
+    public Map<String, Object> listPage(CompanyParam params) {
         return getCompService(user).listPage(params);
     }
 
@@ -57,9 +57,10 @@ public class CompWrapper extends OrganizationWrapper {
     @Log(operateType = OperateTypeEnum.ADD, operateDesc = "新增分部", operateModule = LogModuleNameEnum.COMPANY)
     public Long saveBaseComp(Map<String, Object> params) {
         Long companyId = getCompService(user).saveBaseComp(params);
-        writeOperateLog(new Object() {
-        }.getClass(), params.get("comp_name").toString(), JSON.toJSONString(params), "新增分部");
-        new Thread(new CompanyTriggerRunnable(companyId)).start();
+        // TODO
+        //writeOperateLog(new Object() {
+        //}.getClass(), params.get("comp_name").toString(), JSON.toJSONString(params), "新增分部");
+        //new Thread(new CompanyTriggerRunnable(companyId)).start();
         return companyId;
     }
 
@@ -100,18 +101,18 @@ public class CompWrapper extends OrganizationWrapper {
     /**
      * 根据ID批量删除
      *
-     * @param ids
+     * @param params
      */
     @Log(operateType = OperateTypeEnum.DELETE, operateDesc = "删除分部信息", operateModule = LogModuleNameEnum.COMPANY)
-    public int deleteByIds(Collection<Long> ids) {
-        List<CompPO> compsByIds = getCompMapper().getCompsByIds(ids);
-        int deleteByIds = getCompService(user).deleteByIds(ids);
-        for (CompPO compsById : compsByIds) {
-            writeOperateLog(new Object() {
-            }.getClass(), compsById.getCompName(), JSON.toJSONString(ids), "删除分部信息");
-            new CompanyTriggerRunnable(compsById).run();
-        }
-        return deleteByIds;
+    public Map<String, Object> deleteByIds(Map<String, Object> params) {
+        //List<CompPO> compsByIds = getCompMapper().getCompsByIds(ids);
+        return getCompService(user).deleteByIds(params);
+        //for (CompPO compsById : compsByIds) {
+        //    writeOperateLog(new Object() {
+        //    }.getClass(), compsById.getCompName(), JSON.toJSONString(ids), "删除分部信息");
+        //    new CompanyTriggerRunnable(compsById).run();
+        //}
+        //return deleteByIds;
     }
 
     /**
@@ -134,11 +135,10 @@ public class CompWrapper extends OrganizationWrapper {
     /**
      * 获取搜索条件
      *
-     * @param params
      * @return
      */
-    public Map<String, Object> getSearchCondition(Map<String, Object> params) {
-        return getCompService(user).getSearchCondition(params);
+    public Map<String, Object> getSearchCondition() {
+        return getCompService(user).getSearchCondition();
     }
 
     /**
@@ -165,8 +165,8 @@ public class CompWrapper extends OrganizationWrapper {
      *
      * @return
      */
-    public Map<String, Object> getCompSaveForm() {
-        return getCompService(user).getCompSaveForm();
+    public Map<String, Object> getCompSaveForm(Map<String, Object> params) {
+        return getCompService(user).getCompSaveForm(params);
     }
 
     /**