Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/geoharbour

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

@@ -118,13 +118,13 @@ public class JobBrowserService extends BrowserService {
         Map<String, List<SearchConditionItem>> apiDatas = new HashMap<>();
         List<SearchConditionItem> conditions = new ArrayList<>();
         // 编号
-        SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "jobNo");
+        SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "jobNo");
         // 名称
-        SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobName");
+        SearchConditionItem jobNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "jobName");
         // 所属分部
-        SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "ecCompany", "");
+        SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "ecCompany", "");
         // 所属部门
-        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", "");
+        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547431, "4", "ecDepartment", "");
 
         conditions.add(jobNoItem);
         conditions.add(jobNameItem);

src/com/engine/organization/annotation/TableTitle.java

@@ -7,6 +7,7 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface TableTitle {
+    int labelId() default -1;
     String title();
     String dataIndex();
     String key();

src/com/engine/organization/entity/DeleteParam.java

@@ -4,11 +4,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
 import weaver.general.StringUtil;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -22,13 +21,18 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 public class DeleteParam {
-     private String ids;
+    private String ids;
 
-     public List<Long> getIds() {
-          if(StringUtil.isEmpty(ids)){
-               return new ArrayList<>();
-          }
-          return Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
-     }
+    public List<Long> getIds() {
+        if (StringUtil.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        ArrayList<Long> list = new ArrayList<>();
+        Set<Long> collect = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toSet());
+        if (CollectionUtils.isNotEmpty(collect)) {
+            list.addAll(collect);
+        }
+        return list;
+    }
 
 }

src/com/engine/organization/entity/browser/bo/CusBowserTreeBO.java

@@ -26,7 +26,7 @@ public class CusBowserTreeBO {
                         .domid("sel_" + item.getId())
                         .hasChild(item.getIsParent())
                         .isLeaf(!item.getIsParent())
-                        .isopen(false)
+                        .isopen(true)
                         .key(getKey(item))
                         .name(item.getName())
                         .build()).collect(Collectors.toList());

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

@@ -2,7 +2,6 @@ package com.engine.organization.entity.company.dto;
 
 import com.engine.organization.annotation.OrganizationTable;
 import com.engine.organization.annotation.TableTitle;
-import com.engine.organization.entity.department.dto.DepartmentListDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -35,37 +34,37 @@ public class CompListDTO {
     /**
      * 名称
      */
-    @TableTitle(title = "名称", dataIndex = "subCompanyDesc", key = "subCompanyDesc")
+    @TableTitle(labelId = 547141, title = "名称", dataIndex = "subCompanyDesc", key = "subCompanyDesc")
     private String subCompanyDesc;
 
     /**
      * 编号
      */
-    @TableTitle(title = "编号", dataIndex = "subCompanyCode", key = "subCompanyCode")
+    @TableTitle(labelId = 547118, title = "编号", dataIndex = "subCompanyCode", key = "subCompanyCode")
     private String subCompanyCode;
 
     /**
      * 简称
      */
-    @TableTitle(title = "简称", dataIndex = "subCompanyName", key = "subCompanyName")
+    @TableTitle(labelId = 547181, title = "简称", dataIndex = "subCompanyName", key = "subCompanyName")
     private String subCompanyName;
 
     /**
      * 上级公司
      */
-    @TableTitle(title = "上级分部", dataIndex = "supSubComName", key = "supSubComName")
+    @TableTitle(labelId = 547410, title = "上级分部", dataIndex = "supSubComName", key = "supSubComName")
     private String supSubComName;
 
     private Integer supSubComId;
 
 
-    @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
+    @TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
     private Integer showOrder;
 
     /**
      * 禁用标记
      */
-    @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
+    @TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled")
     private Integer canceled;
 
     /**

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

@@ -5,6 +5,7 @@ import com.engine.organization.entity.department.param.DeptSearchParam;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.department.vo.SingleDeptTreeVO;
 import com.engine.organization.entity.searchtree.SearchTree;
+import com.engine.organization.exception.OrganizationRunTimeException;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections.CollectionUtils;
@@ -32,17 +33,21 @@ public class DepartmentBO {
      * @return
      */
     public static List<DepartmentListDTO> buildDeptDTOShowNames(Collection<DepartmentListDTO> list) {
-        SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
-        DepartmentComInfo departmentComInfo = new DepartmentComInfo();
         return list.stream().peek(e -> {
-                    e.setSubCompanyName((null == e.getSubCompanyId1() || 0 == e.getSubCompanyId1()) ? "" : subCompanyComInfo.getSubCompanyname(Util.null2String(e.getSubCompanyId1())));
-                    e.setSupDepName((null == e.getSupDepId() || 0 == e.getSupDepId()) ? "" : departmentComInfo.getDepartmentname(Util.null2String(e.getSupDepId())));
+                    List<DepartmentListDTO> children = e.getChildren();
+                    if (CollectionUtils.isNotEmpty(children)){
+                        List<DepartmentListDTO> collect = children.stream().peek(item -> item.setBmfzr(getEmployeeNameById(item.getId()))).collect(Collectors.toList());
+                        e.setChildren(collect);
+                    }
                     e.setBmfzr(getEmployeeNameById(e.getId()));
                 }
         ).collect(Collectors.toList());
     }
 
     public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, String orderType) {
+        SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+        DepartmentComInfo departmentComInfo = new DepartmentComInfo();
+
         // 递归添加父级数据
         List<DepartmentListDTO> dtoList = list.stream().map(e ->
                 DepartmentListDTO
@@ -53,6 +58,8 @@ public class DepartmentBO {
                         .departmentCode(e.getDepartmentCode())
                         .subCompanyId1(e.getSubCompanyId1())
                         .supDepId(e.getSupDepId())
+                        .subCompanyName((null == e.getSubCompanyId1() || 0 == e.getSubCompanyId1()) ? "" : subCompanyComInfo.getSubCompanyname(Util.null2String(e.getSubCompanyId1())))
+                        .supDepName((null == e.getSupDepId() || 0 == e.getSupDepId()) ? "" : departmentComInfo.getDepartmentname(Util.null2String(e.getSupDepId())))
                         .showOrder(null == e.getShowOrder() ? 0 : e.getShowOrder())
                         .canceled(null == e.getCanceled() ? 0 : e.getCanceled())
                         .orderType(orderType)
@@ -189,7 +196,7 @@ public class DepartmentBO {
                 }
             }
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new OrganizationRunTimeException(e);
         }
         return StringUtils.join(employeeNameById, ",");
     }

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

@@ -36,32 +36,32 @@ public class DepartmentListDTO {
     /**
      * 名称
      */
-    @TableTitle(title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
+    @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
     private String departmentMark;
 
     /**
      * 编号
      */
-    @TableTitle(title = "编号", dataIndex = "departmentCode", key = "departmentCode")
+    @TableTitle(labelId = 547118, title = "编号", dataIndex = "departmentCode", key = "departmentCode")
     private String departmentCode;
 
     /**
      * 简称
      */
-    @TableTitle(title = "简称", dataIndex = "departmentName", key = "departmentName")
+    @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
 
     /**
      * 所属分部
      */
-    @TableTitle(title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
+    @TableTitle(labelId = 547128, title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
     private String subCompanyName;
     private Integer subCompanyId1;
 
     /**
      * 上级部门
      */
-    @TableTitle(title = "上级部门", dataIndex = "supDepName", key = "supDepName")
+    @TableTitle(labelId = 547189, title = "上级部门", dataIndex = "supDepName", key = "supDepName")
     private String supDepName;
 
     private Integer supDepId;
@@ -69,20 +69,20 @@ public class DepartmentListDTO {
     /**
      * 部门负责人
      */
-    @TableTitle(title = "部门负责人", dataIndex = "bmfzr", key = "bmfzr")
+    @TableTitle(labelId = 547190, title = "部门负责人", dataIndex = "bmfzr", key = "bmfzr")
     private String bmfzr;
 
     /**
      * 显示顺序
      */
-    @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
+    @TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
     private Double showOrder;
 
 
     /**
      * 禁用标记
      */
-    @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
+    @TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled")
     private int canceled;
     /**
      * 操作列

src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java

@@ -26,7 +26,7 @@ public class SingleDeptTreeVO {
 
     private Integer id;
 
-    @TableTitle(title = "编号", dataIndex = "departmentCode", key = "departmentCode")
+    @TableTitle(labelId = 547118, title = "编号", dataIndex = "departmentCode", key = "departmentCode")
     private String departmentCode;
 
     @TableTitle(title = "部门名称", dataIndex = "departmentMark", key = "departmentMark")
@@ -36,7 +36,7 @@ public class SingleDeptTreeVO {
 
     private Integer supDepId; //上级部门id
 
-    @TableTitle(title = "上级部门", dataIndex = "supDepName", key = "supDepName")
+    @TableTitle(labelId = 547189, title = "上级部门", dataIndex = "supDepName", key = "supDepName")
     private String supDepName; //上级部门
 
     //@TableTitle(title = "部门负责人", dataIndex = "deptPrincipalName", key = "deptPrincipalName")

src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java

@@ -34,8 +34,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(index = "0", text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         },
         tableType = WeaTableType.CHECKBOX
 )

src/com/engine/organization/entity/hrmresource/param/HrmStatusHistoryParam.java

@@ -0,0 +1,41 @@
+package com.engine.organization.entity.hrmresource.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/5/29 2:54 PM
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class HrmStatusHistoryParam {
+
+    private Long resourceId;
+
+    private String changeDate;
+
+    private String changeReason;
+
+    private Integer oldJobtitleId;
+
+    private Integer newjobtitleId;
+
+    private Integer typeN;
+
+    private Integer oldDepartmentId;
+
+    private Integer newDepartmentId;
+
+    private Integer oldSubcompanyId;
+
+    private Integer newSubcompanyId;
+
+
+}

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

@@ -34,7 +34,6 @@ import lombok.NoArgsConstructor;
         primarykey = "id",
         operates = {
                 @OrganizationTableOperate(text = "查看"),
-                @OrganizationTableOperate(index = "1", text = "另存为版本")
         },
         tableType = WeaTableType.CHECKBOX
 )

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

@@ -37,8 +37,7 @@ import lombok.NoArgsConstructor;
         sortway = " asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(text = "查看"),
-                @OrganizationTableOperate(index = "1", text = "另存为版本")
+                @OrganizationTableOperate(text = "查看")
         },
         tableType = WeaTableType.CHECKBOX
 )
@@ -52,21 +51,21 @@ public class HrmResourceVO {
     /**
      * 姓名
      */
-    @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname")
+    @OrganizationTableColumn(labelId = 547329, text = "姓名", width = "25%", column = "lastname")
     private String lastName;
     /**
      * 部门
      */
-    @OrganizationTableColumn(text = "部门", width = "25%", column = "departmentid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getDepartmentName")
+    @OrganizationTableColumn(labelId = 547331, text = "部门", width = "25%", column = "departmentid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getDepartmentName")
     private String departmentName;
 
     /**
      * 分部
      */
-    @OrganizationTableColumn(text = "分部", width = "25%", column = "subcompanyid1", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getCompanyName")
+    @OrganizationTableColumn(labelId = 547332, text = "分部", width = "25%", column = "subcompanyid1", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getCompanyName")
     private String companyName;
 
-    @OrganizationTableColumn(text = "岗位", width = "25%", column = "jobtitle", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getJobName")
+    @OrganizationTableColumn(labelId = 547333, text = "岗位", width = "25%", column = "jobtitle", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getJobName")
     private String jobName;
 
     /**
@@ -85,6 +84,6 @@ public class HrmResourceVO {
     @OrganizationTableColumn(text = "直接上级", width = "25%", column = "managerid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getManagerName")
     private String managerName;
 
-    @OrganizationTableColumn(text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
+    @OrganizationTableColumn(labelId = 547185, text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
     private Integer showOrder;
 }

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

@@ -1,67 +0,0 @@
-package com.engine.organization.entity.hrmresource.vo;
-
-import com.cloudstore.eccom.pc.table.WeaTableType;
-import com.engine.organization.annotation.OrganizationTable;
-import com.engine.organization.annotation.OrganizationTableColumn;
-import com.engine.organization.annotation.OrganizationTableOperate;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@OrganizationTable(pageId = "8df45b09-0cda-4f57-a93a-ca9f96a4c111",
-        fields = "t.id," +
-                "t.name," +
-                "t.basic_fields," +
-                "t.personal_fields," +
-                "t.work_fields," +
-                "t.isused," +
-                "t.creator," +
-                "t.create_time," +
-                "t.update_time",
-        fromSql = "FROM jcl_org_custom_template t ",
-        orderby = "id",
-        sortway = "asc",
-        primarykey = "id",
-        operates = {
-                @OrganizationTableOperate(index = "0", text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "另存为"),
-                @OrganizationTableOperate(index = "2", text = "删除")
-        },
-        tableType = WeaTableType.CHECKBOX
-)
-public class JclOrgCustomTemplateVO {
-
-    @OrganizationTableColumn(column = "id", display = false)
-    private Integer id;
-
-    @OrganizationTableColumn(text = "模板名称", width = "30%", column = "name")
-    private String name;
-
-    @OrganizationTableColumn(column = "basic_fields", display = false)
-    private String basicFields;
-
-    @OrganizationTableColumn(column = "personal_fields", display = false)
-    private String personalFields;
-
-    @OrganizationTableColumn(column = "work_fields", display = false)
-    private String workFields;
-
-    @OrganizationTableColumn(column = "isused", display = false)
-    private Integer isUsed;
-
-    @OrganizationTableColumn(column = "creator", display = false)
-    private Integer creator;
-
-    @OrganizationTableColumn(text = "创建时间",column = "create_time", width = "30%")
-    private Date createTime;
-
-    @OrganizationTableColumn(text = "更新时间",column = "update_time", display = false)
-    private Date updateTime;
-}

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

@@ -32,8 +32,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "fid",
         operates = {
-                @OrganizationTableOperate(index = "0", text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除"),
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除"),
                 @OrganizationTableOperate(index = "2", text = "恢复")
         },
         tableType = WeaTableType.CHECKBOX,
@@ -54,13 +54,13 @@ public class ResourceBasicInfoVO {
     /**
      * 编号
      */
-    @OrganizationTableColumn(text = "编号", width = "20%", column = "fno", orderkey = "fno")
+    @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "fno", orderkey = "fno")
     private String fNo;
 
     /**
      * 名称
      */
-    @OrganizationTableColumn(text = "名称", width = "20%", column = "fname")
+    @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "fname")
     private String fName;
 
     /**

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

@@ -80,6 +80,6 @@ public class ScHrmResourceVO {
     @OrganizationTableColumn(text = "直接上级", width = "25%", column = "managerid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getScManagerName")
     private String managerName;
 
-    @OrganizationTableColumn(text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
+    @OrganizationTableColumn(labelId = 547185, text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
     private Integer showOrder;
 }

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

@@ -34,34 +34,34 @@ public class JobListDTO {
     /**
      * 名称
      */
-    @TableTitle(title = "名称", dataIndex = "jobTitleName", key = "jobTitleName", width = "150")
+    @TableTitle(labelId = 547141, title = "名称", dataIndex = "jobTitleName", key = "jobTitleName", width = "150")
     private String jobTitleName;
     /**
      * 编号
      */
-    @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo")
+    @TableTitle(labelId = 547118, title = "编号", dataIndex = "jobNo", key = "jobNo")
     private String jobNo;
     /**
      * 所属分部
      */
-    @TableTitle(title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
+    @TableTitle(labelId = 547128, title = "所属分部", dataIndex = "subCompanyName", key = "subCompanyName")
     private String subCompanyName;
     /**
      * 所属部门
      */
-    @TableTitle(title = "所属部门", dataIndex = "departmentName", key = "departmentName")
+    @TableTitle(labelId = 547431, title = "所属部门", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
 
     /**
      * 职务类别
      */
-    @TableTitle(title = "职务类别", dataIndex = "jobGroupName", key = "jobGroupName")
+    @TableTitle(labelId = 547433, title = "职务类别", dataIndex = "jobGroupName", key = "jobGroupName")
     private String jobGroupName;
 
     /**
      * 所属职务
      */
-    @TableTitle(title = "所属职务", dataIndex = "jobActivityName", key = "jobActivityName")
+    @TableTitle(labelId = 547434, title = "所属职务", dataIndex = "jobActivityName", key = "jobActivityName")
     private String jobActivityName;
     /**
      * 上级岗位
@@ -74,13 +74,13 @@ public class JobListDTO {
     /**
      * 是否关键岗
      */
-    @TableTitle(title = "是否关键岗", dataIndex = "isKey", key = "isKey")
+    @TableTitle(labelId = 547417, title = "是否关键岗", dataIndex = "isKey", key = "isKey")
     private String isKey;
 
     /**
      * 显示顺序
      */
-    @TableTitle(title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
+    @TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
     private Integer showOrder;
 
     /**

src/com/engine/organization/entity/job/vo/JobBrowserVO.java

@@ -28,8 +28,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(index = "0", text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         },
         tableType = WeaTableType.CHECKBOX
 )
@@ -38,7 +38,7 @@ public class JobBrowserVO {
     @OrganizationTableColumn(text = "标识", width = "25%", column = "id", display = false)
     private Long id;
 
-    @OrganizationTableColumn(text = "编号", width = "25%", column = "job_no")
+    @OrganizationTableColumn(labelId = 547118, text = "编号", width = "25%", column = "job_no")
     private String jobNo;
 
     @OrganizationTableColumn(text = "岗位名称", width = "25%", column = "name")

src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java

@@ -26,7 +26,7 @@ public class SingleJobTreeVO {
 
     private Long id;
 
-    @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo")
+    @TableTitle(labelId = 547118, title = "编号", dataIndex = "jobNo", key = "jobNo")
     private String jobNo;
 
     @TableTitle(title = "岗位名称", dataIndex = "jobName", key = "jobName")

src/com/engine/organization/entity/logview/vo/LogViewVO.java

@@ -27,31 +27,31 @@ import java.util.Date;
 )
 public class LogViewVO {
 
-    @OrganizationTableColumn(text = "操作时间", width = "20%", column = "create_time", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getDateTimeFormat")
+    @OrganizationTableColumn(labelId = 547159, text = "操作时间", width = "20%", column = "create_time", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getDateTimeFormat")
     private Date createTime;
 
-    @OrganizationTableColumn(text = "操作者", width = "16%", column = "operator_name")
+    @OrganizationTableColumn(labelId = 547160, text = "操作者", width = "16%", column = "operator_name")
     private String operator;
 
-    @OrganizationTableColumn(text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType")
+    @OrganizationTableColumn(labelId = 547161, text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType")
     private String operateType;
 
-    @OrganizationTableColumn(text = "操作描述", width = "16%", column = "operate_desc")
+    @OrganizationTableColumn(labelId = 547162, text = "操作描述", width = "16%", column = "operate_desc")
     private String operateDesc;
 
-    @OrganizationTableColumn(text = "对象", width = "16%", column = "value")
+    @OrganizationTableColumn(labelId = 547163, text = "对象", width = "16%", column = "value")
     private String value;
 
-    @OrganizationTableColumn(text = "所属模块", width = "16%", column = "operate_module_name")
+    @OrganizationTableColumn(labelId = 547164, text = "所属模块", width = "16%", column = "operate_module_name")
     private String operateModuleName;
 
-    @OrganizationTableColumn(text = "修改详情", width = "16%", column = "message")
+    @OrganizationTableColumn(labelId = 547165, text = "修改详情", width = "16%", column = "message")
     private String showDetail;
 
-    @OrganizationTableColumn(text = "操作IP", width = "16%", column = "client_ip")
+    @OrganizationTableColumn(labelId = 547166, text = "操作IP", width = "16%", column = "client_ip")
     private String clientIp;
 
-    @OrganizationTableColumn(text = "操作参数", width = "16%", column = "params_str", display = false)
+    @OrganizationTableColumn(labelId = 547413, text = "操作参数", width = "16%", column = "params_str", display = false)
     private String paramsStr;
 
 }

src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java

@@ -40,22 +40,22 @@ public class CardAccessVO {
     @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
-    @OrganizationTableColumn(text = "栏目", width = "15%", column = "type_name")
+    @OrganizationTableColumn(labelId = 547389, text = "栏目", width = "15%", column = "type_name")
     private Integer typeName;
 
-    @OrganizationTableColumn(text = "是否启用", width = "15%", column = "status")
+    @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "15%", column = "status")
     private Integer status;
 
-    @OrganizationTableColumn(text = "所有人可见", width = "15%", column = "all_people")
+    @OrganizationTableColumn(labelId = 547390, text = "所有人可见", width = "15%", column = "all_people")
     private Integer allPeople;
 
-    @OrganizationTableColumn(text = "上级可见", width = "15%", column = "superior")
+    @OrganizationTableColumn(labelId = 547392, text = "上级可见", width = "15%", column = "superior")
     private Integer superior;
 
-    @OrganizationTableColumn(text = "所有上级可见", width = "15%", column = "all_superior")
+    @OrganizationTableColumn(labelId = 547392, text = "所有上级可见", width = "15%", column = "all_superior")
     private Integer allSuperior;
 
-    @OrganizationTableColumn(text = "查看自定义", width = "30%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName")
+    @OrganizationTableColumn(labelId = 547414, text = "查看自定义", width = "30%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName")
     private String custom;
 
 }

src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java

@@ -33,8 +33,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(index = "0", text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         }, tableType = WeaTableType.CHECKBOX,
         operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"),
         checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used")
@@ -48,12 +48,12 @@ public class PostInfoTableVO {
     /**
      * 编号
      */
-    @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no", orderkey = "post_info_no")
+    @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "post_info_no", orderkey = "post_info_no")
     private String postInfoNo;
     /**
      * 名称
      */
-    @OrganizationTableColumn(text = "名称", width = "20%", column = "post_info_name")
+    @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "post_info_name")
     private String postInfoName;
     /**
      * 权限
@@ -84,6 +84,6 @@ public class PostInfoTableVO {
     /**
      * 禁用标记
      */
-    @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
+    @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag")
     private Integer forbiddenTag;
 }

src/com/engine/organization/entity/scheme/vo/GradeTableVO.java

@@ -31,8 +31,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         },
         tableType = WeaTableType.CHECKBOX,
         operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"),
@@ -53,12 +53,12 @@ public class GradeTableVO {
     /**
      * 编号
      */
-    @OrganizationTableColumn(text = "编号", width = "20%", column = "grade_no", orderkey = "grade_no")
+    @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "grade_no", orderkey = "grade_no")
     private String gradeNo;
     /**
      * 名称
      */
-    @OrganizationTableColumn(text = "名称", width = "20%", column = "grade_name")
+    @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "grade_name")
     private String gradeName;
 
     /**
@@ -68,22 +68,22 @@ public class GradeTableVO {
     /**
      * 等级方案
      */
-    @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
+    @OrganizationTableColumn( labelId = 547124, text = "等级方案", width = "20%", column = "scheme_name")
     private String schemeName;
     /**
      * 职等
      */
-    @OrganizationTableColumn(text = "职等", width = "20%", column = "level_id", transmethod = "com.engine.organization.transmethod.LevelTransMethod.getLevelId")
+    @OrganizationTableColumn(labelId = 547139, text = "职等", width = "20%", column = "level_id", transmethod = "com.engine.organization.transmethod.LevelTransMethod.getLevelId")
     private String levelId;
 
     /**
      * 描述说明
      */
-    @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
+    @OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "30%", column = "description")
     private String description;
     /**
      * 禁用标记
      */
-    @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
+    @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag")
     private int forbiddenTag;
 }

src/com/engine/organization/entity/scheme/vo/LevelTableVO.java

@@ -30,8 +30,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         }, tableType = WeaTableType.CHECKBOX,
         operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"),
         checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used")
@@ -51,30 +51,30 @@ public class LevelTableVO {
     /**
      * 编号
      */
-    @OrganizationTableColumn(text = "编号", width = "20%", column = "level_no", orderkey = "level_no")
+    @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "level_no", orderkey = "level_no")
     private String levelNo;
     /**
      * 名称
      */
-    @OrganizationTableColumn(text = "名称", width = "20%", column = "level_name")
+    @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "level_name")
     private String levelName;
 
     /**
      * 等级方案
      */
-    @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
+    @OrganizationTableColumn(text = "等级方案", labelId = 547124, width = "20%", column = "scheme_name")
     private String schemeName;
 
     /**
      * 描述说明
      */
-    @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
+    @OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "30%", column = "description")
     private String description;
 
 
     /**
      * 禁用标记
      */
-    @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
+    @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag")
     private Integer forbiddenTag;
 }

src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java

@@ -29,8 +29,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(index = "0", text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         },
         tableType = WeaTableType.CHECKBOX,
         operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"),
@@ -51,26 +51,26 @@ public class SchemeTableVO {
     /**
      * 方案编号
      */
-    @OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no", orderkey = "scheme_no")
+    @OrganizationTableColumn(text = "编号", labelId = 547118, width = "25%", column = "scheme_no", orderkey = "scheme_no")
     private String schemeNo;
     /**
      * 方案名称
      */
-    @OrganizationTableColumn(text = "方案名称", width = "25%", column = "scheme_name")
+    @OrganizationTableColumn(text = "方案名称", labelId = 547127, width = "25%", column = "scheme_name")
     private String schemeName;
 
-    @OrganizationTableColumn(text = "所属分部", width = "25%", column = "subcompanyid",transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById")
+    @OrganizationTableColumn(text = "所属分部", labelId = 547128, width = "25%", column = "subcompanyid", transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById")
     private String subCompanyName;
 
     /**
      * 方案描述
      */
-    @OrganizationTableColumn(text = "方案说明", width = "40%", column = "scheme_description")
+    @OrganizationTableColumn(text = "方案说明", labelId = 547129, width = "40%", column = "scheme_description")
     private String schemeDescription;
 
     /**
      * 禁用标识
      */
-    @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
+    @OrganizationTableColumn(text = "是否启用", labelId = 547130, width = "10%", column = "forbidden_tag")
     private Integer forbiddenTag;
 }

src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java

@@ -34,8 +34,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         },
         tableType = WeaTableType.CHECKBOX,
         operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatSourceOperates", otherpara = "column:is_used"),
@@ -57,30 +57,30 @@ public class SequenceTableVO {
     /**
      * 编号
      */
-    @OrganizationTableColumn(text = "编号", width = "20%", column = "sequence_no", orderkey = "sequence_no")
+    @OrganizationTableColumn(labelId = 547118, text = "编号", width = "20%", column = "sequence_no", orderkey = "sequence_no")
     private String sequenceNo;
     /**
      * 名称
      */
-    @OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name")
+    @OrganizationTableColumn(labelId = 547141, text = "名称", width = "20%", column = "sequence_name")
     private String sequenceName;
 
 
     /**
      * 等级方案
      */
-    @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
+    @OrganizationTableColumn(text = "等级方案", labelId = 547124, width = "20%", column = "scheme_name")
     private String schemeName;
 
     /**
      * 描述说明
      */
-    @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
+    @OrganizationTableColumn(labelId = 547142, text = "描述说明", width = "30%", column = "description")
     private String description;
 
     /**
      * 禁用标记
      */
-    @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
+    @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "10%", column = "forbidden_tag")
     private Integer forbiddenTag;
 }

src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java

@@ -24,8 +24,8 @@ import lombok.NoArgsConstructor;
         sortway = "asc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除")
         }, tableType = WeaTableType.CHECKBOX,
         operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatStaffOperates", otherpara = "column:is_used"),
         checkboxPopedom = @CheckboxPopedom(showmethod = "com.engine.organization.util.ConfigTrans.getCheckBoxPopedom", popedompara = "column:is_used")
@@ -46,12 +46,12 @@ public class StaffPlanTableVO {
     /**
      * 编号
      */
-    @OrganizationTableColumn(text = "编号", width = "16%", column = "plan_no", orderkey = "plan_no")
+    @OrganizationTableColumn(labelId = 547118, text = "编号", width = "16%", column = "plan_no", orderkey = "plan_no")
     private String planNo;
     /**
      * 名称
      */
-    @OrganizationTableColumn(text = "名称", width = "16%", column = "plan_name")
+    @OrganizationTableColumn(labelId = 547141, text = "名称", width = "16%", column = "plan_name")
     private String planName;
     /**
      * w维度
@@ -76,7 +76,7 @@ public class StaffPlanTableVO {
     /**
      * 状态
      */
-    @OrganizationTableColumn(text = "是否启用", width = "16%", column = "forbidden_tag")
+    @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "16%", column = "forbidden_tag")
     private Integer forbiddenTag;
 
 }

src/com/engine/organization/entity/staff/vo/StaffTableVO.java

@@ -23,8 +23,8 @@ import lombok.NoArgsConstructor;
         orderby = "id desc",
         primarykey = "id",
         operates = {
-                @OrganizationTableOperate(text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除"),
+                @OrganizationTableOperate(index = "0", labelId = 547132, text = "编辑"),
+                @OrganizationTableOperate(index = "1", labelId = 547135, text = "删除"),
                 @OrganizationTableOperate(index = "2", text = "变更")
         }, tableType = WeaTableType.CHECKBOX
 

src/com/engine/organization/enums/OrgImportEnum.java

@@ -2,6 +2,7 @@ package com.engine.organization.enums;
 
 import com.engine.organization.exception.OrganizationRunTimeException;
 import com.engine.organization.util.saveimport.PostInfoImportUtil;
+import com.engine.organization.util.saveimport.SequenceImportUtil;
 import com.engine.organization.util.saveimport.StaffInfoImportUtil;
 import weaver.hrm.User;
 
@@ -29,6 +30,20 @@ public enum OrgImportEnum implements OrgImportAdapter {
             return StaffInfoImportUtil.importForm(user);
         }
     },
+    SEQUENCE("sequence"){
+        @Override
+        public Map<String, Object> orgImport(Map<String, Object> params, User user) {
+            Map<String, Object> resultMap = new HashMap<>();
+            String excelFile = (String) params.get("excelfile");
+            resultMap.put("pId", SequenceImportUtil.saveImport("add", excelFile, user));
+            return resultMap;
+        }
+
+        @Override
+        public List<Map<String, Object>> orgForm(User user) {
+            return SequenceImportUtil.importForm(user);
+        }
+    },
     POSTINFO("postInfo"){
         @Override
         public Map<String, Object> orgImport(Map<String, Object> params, User user) {
@@ -45,6 +60,7 @@ public enum OrgImportEnum implements OrgImportAdapter {
     };
 
 
+
     private String tableName;
 
     OrgImportEnum(String tableName) {

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

@@ -106,9 +106,9 @@
         select
         <include refid="baseColumns"/>
         from hrmsubcompany t
-        WHERE id IN
-        <foreach collection="ids" open="(" item="id" separator="," close=")">
-            #{id}
+        WHERE (t.canceled is null or t.canceled != '1') and id IN
+        <foreach collection="ids" index="index" open="(" item="id" separator="," close=")">
+            <if test="(index % 999) == 998"> NULL) OR id IN(</if>#{id}
         </foreach>
     </select>
 
@@ -117,25 +117,25 @@
         <include refid="baseColumns"/>
         FROM
         hrmsubcompany t
-        WHERE t.SUPSUBCOMID = 0
+        WHERE t.SUPSUBCOMID = 0 and (t.canceled is null or t.canceled != '1')
     </select>
 
     <select id="hasSubs" resultType="java.lang.String">
         select supsubcomid
         from hrmsubcompany
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
         union
         select subcompanyid1
         from hrmdepartment
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
     </select>
 
     <select id="hasDetachSubs" resultType="java.lang.String">
         select supsubcomid
         from hrmsubcompany
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
         and id in
         <foreach collection="companyIds" open="(" item="id" separator="," close=")">
@@ -144,7 +144,7 @@
         union
         select subcompanyid1
         from hrmdepartment
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="subsWhere"/>
         and subcompanyid1 in
         <foreach collection="companyIds" open="(" item="id" separator="," close=")">

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

@@ -51,7 +51,7 @@
         select
         <include refid="baseColumns"/>
         from hrmdepartment t
-        where 1=1
+        where (t.canceled is null or t.canceled != '1')
         <include refid="likeSQL"/>
         <if test=" departmentPO.subCompanyId1 != null ">
             and t.subCompanyId1 = #{departmentPO.subCompanyId1}
@@ -137,7 +137,7 @@
     <select id="hasSubs" resultType="java.lang.String">
         select distinct supDepId
         from hrmdepartment
-        where 1=1
+        where (canceled is null or canceled != '1')
         <include refid="com.engine.organization.mapper.comp.CompMapper.subsWhere"/>
     </select>
     <select id="countUsedInJob" resultType="java.lang.Integer">

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java

@@ -3,7 +3,6 @@ package com.engine.organization.mapper.hrmresource;
 
 import com.engine.organization.entity.commom.RecordInfo;
 import com.engine.organization.entity.jclimport.po.CusFormFieldPO;
-import com.engine.organization.entity.jclimport.po.JclSelectItem;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
@@ -44,19 +43,6 @@ public interface SystemDataMapper {
      */
     int updateResourceJobTitleByIds(@Param("jobTitle") String jobTitle, @Param("ids") Collection<Long> ids);
 
-    /**
-     * 人员，hrmResource表字段
-     *
-     * @return
-     */
-    List<CusFormFieldPO> getHrmFieldBeanList();
-
-    List<CusFormFieldPO> getHrmFieldBeanListByFields(@Param("fields") Collection<String> fields);
-
-    List<CusFormFieldPO> getHrmCustomFieldList();
-
-    List<JclSelectItem> getSelectItems(@Param("tableName") String tableName, @Param("fieldId") Long fieldId);
-
     Long getHrmResourceMaxId();
 
     List<String> getBatchUuidByIds(@Param("tableName") String tableName, @Param("ecIds") List<String> ecIds);

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml

@@ -100,57 +100,6 @@
         where departmentid = #{departmentId}
           And jobTitle = #{jobTitle}
     </select>
-    <select id="getHrmFieldBeanList" resultMap="CustomFieldMap">
-        select b.labelname   as fieldlable,
-               '0'           as scopeid,
-               a.fieldid,
-               a.fieldname,
-               a.ismand,
-               a.fieldhtmltype,
-               a.type,
-               'hrmresource' as tablename
-        from hrm_formfield a
-                 inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
-        where a.fielddbtype != '6'
-        order by groupid, fieldorder
-    </select>
-    <select id="getHrmCustomFieldList" resultMap="CustomFieldMap">
-        select b.labelname      as fieldlable,
-               a.scopeid,
-               a.fieldid,
-               a.hrm_fieldlable as fieldname,
-               a.ismand,
-               c.fieldhtmltype,
-               c.type,
-               a.dmlurl,
-               'cus_fielddata'  as tablename
-        from cus_formfield a
-                 inner join htmllabelinfo b on a.fieldlable = b.indexid and b.languageid = 7
-                 inner join cus_formdict c on a.fieldid = c.id and c.fieldhtmltype != '6'
-        order by groupid, fieldorder
-    </select>
-    <select id="getSelectItems" resultMap="SelectItemMap">
-        select fieldid, selectvalue, selectname
-        from ${tableName} and fieldid = #{fieldId}
-    </select>
-    <select id="getHrmFieldBeanListByFields" resultMap="CustomFieldMap">
-        select b.labelname as fieldlable,
-        a.fieldid,
-        a.fieldname,
-        a.ismand,
-        a.fieldhtmltype,
-        a.type,
-        '0' as scopeid,
-        'hrmresource' as tablename
-        from hrm_formfield a
-        inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
-        where a.fielddbtype != '6' and a.isuse = '1'
-        and a.fieldname in
-        <foreach collection="fields" open="(" item="field" separator="," close=")">
-            #{field}
-        </foreach>
-        order by groupid ,fieldorder
-    </select>
     <select id="getHrmResourceMaxId" resultType="java.lang.Long">
         select max(id)
         from hrmresource

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

@@ -1,9 +1,8 @@
 package com.engine.organization.mapper.resource;
 
-import com.alibaba.fastjson.JSONObject;
+import com.engine.organization.entity.hrmresource.param.SearchTemplateParam;
 import com.engine.organization.entity.hrmresource.po.ResourceChartPO;
 import com.engine.organization.entity.hrmresource.po.ResourcePO;
-import com.engine.organization.entity.hrmresource.param.SearchTemplateParam;
 import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
 import com.engine.organization.entity.resume.po.HrmFamilyInfoPO;
 import com.engine.organization.entity.resume.po.PersonnelResumePO;
@@ -74,9 +73,8 @@ public interface HrmResourceMapper {
 
     Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
 
-    List<JSONObject> queryAllResColumns(@Param("level") String level, @Param("grade") String grade);
 
-    String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId);
+    String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId, @Param("language") Integer language);
 
 
     /**

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

@@ -408,11 +408,7 @@
         </if>
     </sql>
 
-    <select id="queryAllResColumns" parameterType="java.lang.String" resultType="com.alibaba.fastjson.JSONObject">
-        select a.fieldid, a.fieldname, b.labelname, a.issystem, a.ismand
-        from hrm_formfield a
-                 inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
-    </select>
+
     <select id="getSearchTemplateByName"
             resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
         select *
@@ -433,12 +429,13 @@
         from hrm_formfield a
                  inner join htmllabelinfo b on a.fieldlabel = b.indexid
         where a.FIELDNAME = #{fieldName}
-          and b.LANGUAGEID = '7'
+          and b.LANGUAGEID = ${language}
         union all
-        SELECT t1.hrm_fieldlable as labelname
+        SELECT t3.LABELNAME as labelname
         FROM cus_formfield t1,
-             cus_formdict t2
-        WHERE t1.fieldid = t2.id
+             cus_formdict t2,
+             htmllabelinfo t3
+        WHERE t1.fieldid = t2.id and t1.FIELDLABLE = t3.indexid and t3.LANGUAGEID = ${language}
           AND t1.scope = 'HrmCustomFieldByInfoType'
           and t1.SCOPEID = #{scopeId}
           and t2.fieldname = #{fieldName}

src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java

@@ -26,7 +26,7 @@ public interface JclOrgCustomTemplateMapper {
 
     int updateByPrimaryKey(JclOrgCustomTemplatePO record);
 
-    List<JclOrgCustomTemplatePO> listAll();
+    List<JclOrgCustomTemplatePO> listAllByCreator(@Param("creator") Integer creator);
 
     List<Long> listAllId();
 

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

@@ -28,10 +28,10 @@
         from jcl_org_custom_template
         where  id = #{id,jdbcType=INTEGER} 
     </select>
-    <select id="listAll" resultMap="BaseResultMap">
+    <select id="listAllByCreator" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from jcl_org_custom_template order by id
+        from jcl_org_custom_template where creator = #{creator} order by id
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

src/com/engine/organization/mapper/scheme/SchemeMapper.java

@@ -99,6 +99,7 @@ public interface SchemeMapper {
 
     List<SchemePO> getSchemesByIds(@Param("ids")Collection<Long> ids);
 
-
     List<Integer> selectBySubcompanyId(@Param("subCompanyIds") Collection<Integer> subCompanyIds);
+
+    List<SchemePO> selectByParams(@Param("subCompanyId") Integer subCompanyId,@Param("schemeName") String schemeName);
 }

src/com/engine/organization/mapper/scheme/SchemeMapper.xml

@@ -276,4 +276,10 @@
         </foreach>
     </select>
 
+    <select id="selectByParams" parameterType="com.engine.organization.entity.scheme.po.SchemePO" resultMap="BaseResultMap">
+        select
+        <include refid="baseColumns"/>
+        from jcl_org_scheme t where subcompanyid = #{subCompanyId} AND scheme_name = #{schemeName} AND delete_type = 0
+    </select>
+
 </mapper>

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

@@ -45,6 +45,13 @@ public interface ImportCommonService {
 
     Map<String,Object>  saveCommonImport(Map<String, Object> params);
 
+    /**
+     * @Description: 通用导入表单模板
+     * @Author: liang.cheng
+     * @Date: 2024/3/11 4:05 PM
+     * @param: [importModule]
+     * @return: java.util.Map<java.lang.String,java.lang.Object>
+     */
     Map<String, Object> getCommonForm(String importModule);
 
 }

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

@@ -19,6 +19,7 @@ import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -101,10 +102,10 @@ public class CardAccessServiceImpl extends Service implements CardAccessService
     @Override
     public Map<String, Object> getCardButtonTable() {
         List<ExtendInfoPO> infoPOList = new ArrayList<>();
-        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc("按钮名称").fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc("启用").fieldType("char(1)").controlType(7).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc("跳转地址").fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc("角色").fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc(SystemEnv.getHtmlLabelName(547386,user.getLanguage())).fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).fieldType("char(1)").controlType(7).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc(SystemEnv.getHtmlLabelName(547387,user.getLanguage())).fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc(SystemEnv.getHtmlLabelName(547388,user.getLanguage())).fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build());
 
         Map<String, Object> tabInfoMap = new HashMap<>();
         tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, 2, false, true));

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

@@ -197,6 +197,8 @@ public class ChartServiceImpl extends Service implements ChartService {
                         chartPO.setExpand("0");
                         chartPO.setFisvitual(rs.getString("isvitual"));
                         chartPO.setHasChildren(getHasChildren(chartPO.getFtype(), chartPO.getFobjid()).toString());
+                        chartPO.setOnJobNum(isRealTime ? Util.getIntValue(rs.getString("on_job_num"),0) : Util.getIntValue(rs.getString("job_num"),0));
+                        chartPO.setStaffNum(Util.getIntValue(rs.getString("staff_num"),0));
                         filterAndAddData(dataList, chartPO, hideDepartment);
 
                         //dataList.add(chartPO);
@@ -383,7 +385,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         chartPO.setFname(name);
         // 岗位处理后的ID
         chartPO.setParentId(parentId);
-        chartPO.setExpand("0");
+        chartPO.setExpand("1");
         chartPO.setHasChildren("0");
         chartPO.setBelongto(Util.null2String(belongTo));
         chartPO.setCompanyWorkYear(companyWorkYear);
@@ -1321,8 +1323,10 @@ public class ChartServiceImpl extends Service implements ChartService {
                     // 一级分部数据分权处理
                     if (isRealTime && user.getUID() != 1 && isRealDimension) {
                         DetachUtil detachUtil = new DetachUtil(user);
-                        String ids = detachUtil.getJclRoleLevels();
-                        sql = sql + " and a.id in ("+ids+")";
+                        if(detachUtil.isDETACH()) {
+                            String ids = detachUtil.getJclRoleLevels();
+                            sql = sql + " and a.id in (" + ids + ")";
+                        }
                     }
                     break;
                 case "1":

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

@@ -91,13 +91,13 @@ public class CompServiceImpl extends Service implements CompService {
                 compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
-            pageInfos = new PageInfo<>(subList, CompListDTO.class);
+            pageInfos = new PageInfo<>(user, subList, CompListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
         } else {
             // 组合list
             List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, orderType.toString());
             List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
-            pageInfos = new PageInfo<>(subList, CompListDTO.class);
+            pageInfos = new PageInfo<>(user, subList, CompListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
         }
 
@@ -106,7 +106,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());
+        List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList());
         table.setColumns(weaTableColumn);
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
@@ -150,7 +150,7 @@ public class CompServiceImpl extends Service implements CompService {
             if (CollectionUtils.isNotEmpty(compPOS)) {
                 addDisableIds(disableIds, compPOS);
             }
-            OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supSubComId)), "上级分部不能选择分部本身及其下级分部");
+            OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supSubComId)), SystemEnv.getHtmlLabelName(547257,user.getLanguage()));
         }
 
         new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync();
@@ -178,13 +178,13 @@ public class CompServiceImpl extends Service implements CompService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
         // 编号
-        SearchConditionItem subCompanyCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "subCompanyCode");
+        SearchConditionItem subCompanyCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "subCompanyCode");
         // 名称
-        SearchConditionItem subCompanyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "subCompanyDesc");
+        SearchConditionItem subCompanyDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "subCompanyDesc");
         // 简称
-        SearchConditionItem subCompanyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "简称", "subCompanyName");
+        SearchConditionItem subCompanyNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547181, "subCompanyName");
         // 上级公司
-        SearchConditionItem supSubComIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "supSubComId", "");
+        SearchConditionItem supSubComIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "supSubComId", "");
 
         conditionItems.add(subCompanyCodeItem);
         conditionItems.add(subCompanyDescItem);
@@ -197,7 +197,7 @@ public class CompServiceImpl extends Service implements CompService {
 
     @Override
     public Map<String, List<MenuBtn>> getHasRight() {
-        return MenuBtn.getDatasNoBtnColum();
+        return MenuBtn.getDatasNoBtnColum(user.getLanguage());
     }
 
     @Override
@@ -374,8 +374,8 @@ public class CompServiceImpl extends Service implements CompService {
     public List<SearchConditionGroup> getMoveForm() {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "转移到", "164", "company", "compBrowser");
-        compBrowserItem.setHelpfulTip("在不选择分部情况下,默认转移到集团下一级分部！！！");
+        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547275, "164", "company", "compBrowser");
+        compBrowserItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547258,user.getLanguage()));
         condition.add(compBrowserItem);
         addGroups.add(new SearchConditionGroup("", true, condition));
         return addGroups;
@@ -393,7 +393,7 @@ public class CompServiceImpl extends Service implements CompService {
         if (CollectionUtils.isNotEmpty(compPOS)) {
             addDisableIds(disableIds, compPOS);
         }
-        OrganizationAssert.isFalse(disableIds.contains(targetCompanyId), "请勿选择当前分部本身及其子分部");
+        OrganizationAssert.isFalse(disableIds.contains(targetCompanyId), SystemEnv.getHtmlLabelName(547259,user.getLanguage()));
 
         Map<String, Object> map = new HashMap<>();
         map.put("id", companyId.toString());

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

@@ -13,7 +13,6 @@ import com.engine.hrm.entity.RuleCodeType;
 import com.engine.hrm.service.impl.OrganizationServiceImpl;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.TopTab;
-import com.engine.organization.entity.codesetting.po.CodeRulePO;
 import com.engine.organization.entity.company.bo.CompBO;
 import com.engine.organization.entity.company.po.CompPO;
 import com.engine.organization.entity.department.bo.DepartmentBO;
@@ -29,7 +28,6 @@ import com.engine.organization.entity.searchtree.SearchTreeParams;
 import com.engine.organization.enums.LogModuleNameEnum;
 import com.engine.organization.enums.OperateTypeEnum;
 import com.engine.organization.exception.OrganizationRunTimeException;
-import com.engine.organization.mapper.codesetting.CodeRuleMapper;
 import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.mapper.job.JobMapper;
@@ -75,10 +73,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         return MapperProxyFactory.getProxy(DepartmentMapper.class);
     }
 
-    private static JobMapper getJobMapper() {
-        return MapperProxyFactory.getProxy(JobMapper.class);
-    }
-
     private CompMapper getCompMapper() {
         return MapperProxyFactory.getProxy(CompMapper.class);
     }
@@ -90,7 +84,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         List<DepartmentPO> departmentPOS = MapperProxyFactory.getProxy(DepartmentMapper.class).listAll("showOrder");
         PageInfo<DepartmentPO> pageInfo = new PageInfo<>(departmentPOS);
         List<SingleDeptTreeVO> singleDeptTreeVOS = DepartmentBO.buildSingleDeptTreeVOS(departmentPOS, param.getParentComp());
-        PageInfo<SingleDeptTreeVO> pageInfos = new PageInfo<>(singleDeptTreeVOS, SingleDeptTreeVO.class);
+        PageInfo<SingleDeptTreeVO> pageInfos = new PageInfo<>(user, singleDeptTreeVOS, SingleDeptTreeVO.class);
         pageInfos.setTotal(pageInfo.getTotal());
         pageInfos.setPageNum(param.getCurrent());
         pageInfos.setPageSize(param.getPageSize());
@@ -103,7 +97,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         List<JobPO> jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listAll();
         PageInfo<JobPO> pageInfo = new PageInfo<>(jobPOS);
         List<SingleJobTreeVO> singleDeptTreeVOS = JobBO.buildSingleJobTreeVOS(jobPOS, param.getParentDept());
-        PageInfo<SingleJobTreeVO> pageInfos = new PageInfo<>(singleDeptTreeVOS, SingleJobTreeVO.class);
+        PageInfo<SingleJobTreeVO> pageInfos = new PageInfo<>(user, singleDeptTreeVOS, SingleJobTreeVO.class);
         pageInfos.setTotal(pageInfo.getTotal());
         pageInfos.setPageNum(param.getCurrent());
         pageInfos.setPageSize(param.getPageSize());
@@ -150,13 +144,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
                 compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
-            pageInfos = new PageInfo<>(DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
+            pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
         } else {
             // 组合list
             List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, orderType.toString());
             List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
-            pageInfos = new PageInfo<>(DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
+            pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);
             pageInfos.setTotal(compListDTOS.size());
         }
 
@@ -165,7 +159,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
         OrganizationWeaTable<DepartmentListDTO> table = new OrganizationWeaTable<>(user, DepartmentListDTO.class);
         List<Column> columns = pageInfos.getColumns();
-        List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList());
+        List<WeaTableColumn> weaTableColumn = columns.stream().map(v -> new WeaTableColumn("100", SystemEnv.getHtmlLabelName(v.getLabelId(),user.getLanguage()), v.getKey())).collect(Collectors.toList());
 
         table.setColumns(weaTableColumn);
 
@@ -212,7 +206,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             if (CollectionUtils.isNotEmpty(deptListByPId)) {
                 addDisableIds(disableIds, deptListByPId);
             }
-            OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supDepId)), "上级部门不能选择部门本身及其下级部门");
+            OrganizationAssert.isFalse(disableIds.contains(Integer.parseInt(supDepId)), SystemEnv.getHtmlLabelName(547411,user.getLanguage()));
         }
 
         new OrganizationSyncEc(user, LogModuleNameEnum.DEPARTMENT, OperateTypeEnum.UPDATE, params).sync();
@@ -231,13 +225,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
         // 编号
-        SearchConditionItem departmentCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "departmentCode");
+        SearchConditionItem departmentCodeItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "departmentCode");
         // 名称
-        SearchConditionItem departmentNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "departmentName");
+        SearchConditionItem departmentNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "departmentName");
         // 所属分部
-        SearchConditionItem subCompanyId1Item = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "subCompanyId1", "");
+        SearchConditionItem subCompanyId1Item = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "subCompanyId1", "");
         // 上级部门
-        SearchConditionItem supDepIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级部门", "4", "supDepId", "");
+        SearchConditionItem supDepIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547189, "4", "supDepId", "");
 
         conditionItems.add(departmentCodeItem);
         conditionItems.add(departmentNameItem);
@@ -251,16 +245,16 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
     @Override
     public Map<String, List<MenuBtn>> getHasRight() {
-        MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
-        Map<String, List<MenuBtn>> datasNoBtnColum = MenuBtn.getDatasNoBtnColum();
-        datasNoBtnColum.get("topMenu").add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
-        datasNoBtnColum.get("rightMenu").add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("export").menuIcon("icon-coms-export").menuName("全部导出").type("BTN_Export").build());
+        MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName(SystemEnv.getHtmlLabelName(547117,user.getLanguage())).type("BTN_Addnew").build();
+        Map<String, List<MenuBtn>> datasNoBtnColum = MenuBtn.getDatasNoBtnColum(user.getLanguage());
+        datasNoBtnColum.get("topMenu").add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("export").menuIcon("icon-coms-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_Export").build());
+        datasNoBtnColum.get("rightMenu").add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("export").menuIcon("icon-coms-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_Export").build());
         return datasNoBtnColum;
     }
 
     @Override
     public Map<String, Object> getDeptBaseForm(Map<String, Object> params) {
-        OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型");
+        OrganizationAssert.notNull(params.get("viewAttr"), SystemEnv.getHtmlLabelName(547260,user.getLanguage()));
         // 2编辑 1查看
         int viewAttr = Integer.parseInt((String) params.get("viewAttr"));
 
@@ -405,7 +399,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         resultMap.put("conditions", groupList);
         resultMap.put("id", id);
         List<TopTab> topTabs = new ArrayList<>();
-        topTabs.add(TopTab.builder().color("#000000").groupId("4").showcount(false).title("部门信息").viewCondition("4").build());
+        topTabs.add(TopTab.builder().color("#000000").groupId("4").showcount(false).title(SystemEnv.getHtmlLabelName(547412,user.getLanguage())).viewCondition("4").build());
         resultMap.put("tabInfo", topTabs);
 
         Map<String, Object> apiDatas = new HashMap<>();
@@ -430,9 +424,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     public List<SearchConditionGroup> getCopyForm() {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "164", "company", "");
+        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547261, "164", "company", "");
         compBrowserItem.setRules("required|string");
-        SearchConditionItem copySubDeptItem = OrganizationFormItemUtil.selectItem(user, Lists.newArrayList(new SearchConditionOption("1", "")), 2, 5, 10, false, "复制子部门信息", "copySubDept");
+        SearchConditionItem copySubDeptItem = OrganizationFormItemUtil.selectItem(user, Lists.newArrayList(new SearchConditionOption("1", "")), 2, 5, 10, false, SystemEnv.getHtmlLabelName(547262,user.getLanguage()), "copySubDept");
         copySubDeptItem.setDetailtype(2);
         condition.add(compBrowserItem);
         condition.add(copySubDeptItem);
@@ -450,7 +444,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     public int copyDepartment(DeptCopyParam copyParam) {
         // 批量复制，后续优化
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notBlank(copyParam.getCompany(), "请指定需要复制的公司/分部");
+        OrganizationAssert.notBlank(copyParam.getCompany(), SystemEnv.getHtmlLabelName(547263,user.getLanguage()));
         int insertCount = 0;
         // 需复制的部门
         List<Integer> idList = Arrays.stream(copyParam.getIds().split(",")).map(Integer::parseInt).collect(Collectors.toList());
@@ -466,7 +460,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     private void recursionCopyDept(Integer originalDeptId, Integer parentDepartmentId, Integer companyId, Double maxShowOrder, String copyJob, String copySubDept, String copySubJob) {
         // 源部门
         DepartmentPO deptById = getDepartmentMapper().getDeptById(originalDeptId);
-        long timeMillis = System.currentTimeMillis();
         // 处理自动编号
         deptById.setDepartmentCode(null);
         // 设置上级分部
@@ -480,19 +473,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         Map<String, Object> syncMap = addEcDepartment(deptById);
         String ecDepartmentID = Util.null2String(syncMap.get("id"));
         OrganizationAssert.isTrue(StringUtils.isNotBlank(ecDepartmentID), syncMap.get("message").toString());
-        // 更新组织架构图
-        // new DepartmentTriggerRunnable(deptById.getId()).run();
-
-        //  复制当前部门岗位信息
-        //if ("1".equals(copyJob)) {
-        //    List<JobPO> jobPOS = MapperProxyFactory.getProxy(JobMapper.class).listJobsByDepartmentId(originalDeptId);
-        //    jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
-        //    Integer maxJobOrder = MapperProxyFactory.getProxy(JobMapper.class).getMaxShowOrder();
-        //    if (maxJobOrder == null) {
-        //        maxJobOrder = 0;
-        //    }
-        //    recursionCopyJob(jobPOS, companyId, Integer.parseInt(ecDepartmentID), null, maxJobOrder, timeMillis);
-        //}
 
         // 是否复制子部门信息
         if ("1".equals(copySubDept)) {
@@ -509,9 +489,9 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     public List<SearchConditionGroup> getMergeForm() {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到部门", "4", "department", "");
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547264, "4", "department", "");
         deptBrowserItem.setRules("required|string");
-        SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName");
+        SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547265, "mergeName");
         mergeNameItem.setRules("required|string");
 
         condition.add(deptBrowserItem);
@@ -529,10 +509,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
 
         // 断言判断
-        OrganizationAssert.isFalse(null == targetDepartment, "被合并部门数据有误，暂时无法合并");
-        OrganizationAssert.isFalse(mergeParam.getId().equals(targetDepartment.getId()), "所选部门与待合并部门一致，无需操作");
-        OrganizationAssert.notNull(mergeParam.getDepartment(), "请选择需要合并的部门");
-        OrganizationAssert.notBlank(mergeParam.getMergeName(), "请输入合并后的名称");
+        OrganizationAssert.isFalse(null == targetDepartment, SystemEnv.getHtmlLabelName(547266,user.getLanguage()));
+        OrganizationAssert.isFalse(mergeParam.getId().equals(targetDepartment.getId()), SystemEnv.getHtmlLabelName(547267,user.getLanguage()));
+        OrganizationAssert.notNull(mergeParam.getDepartment(), SystemEnv.getHtmlLabelName(547268,user.getLanguage()));
+        OrganizationAssert.notBlank(mergeParam.getMergeName(), SystemEnv.getHtmlLabelName(547270,user.getLanguage()));
 
         // 不可选择合并的数据，本身及子部门
         Set<Integer> disableIds = new HashSet<>();
@@ -542,7 +522,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         if (CollectionUtils.isNotEmpty(deptListByPId)) {
             addDisableIds(disableIds, deptListByPId);
         }
-        OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), "请勿选择当前部门本身及其子部门");
+        OrganizationAssert.isFalse(disableIds.contains(targetDepartment.getId()), SystemEnv.getHtmlLabelName(547271,user.getLanguage()));
 
         // 查询该部门下一级部门
         List<DepartmentPO> firstChildDeptList = getDepartmentMapper().getDeptListByPId(mergeParam.getId());
@@ -551,41 +531,24 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             departmentPO.setSupDepId(targetDepartment.getId());
             departmentPO.setSubCompanyId1(targetDepartment.getSubCompanyId1());
             updateEcDepartment(departmentPO);
-            // 更新组织架构图
-            // new DepartmentTriggerRunnable(departmentPO.getId()).run();
         }
-        // 查询该部门一级岗位、更新岗位所属分部、所属部门
-        //List<JobPO> firstChildJobList = getJobMapper().listJobsByDepartmentId(mergeParam.getId());
-        //firstChildJobList = firstChildJobList.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
         // 批量更新部门、所属分部
         RecordSet rs = new RecordSet();
         String targetEcDeptId = targetDepartment.getId().toString();
         String mergeEcDeptId = mergeParam.getId().toString();
-        //rs.executeUpdate("update jcl_org_job set parent_comp =?,ec_company =?,parent_dept =?,ec_department =? where ec_department =?", targetDepartment.getSubCompanyId1(), targetDepartment.getSubCompanyId1(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId());
-        // 更新岗位组织架构图
-        //for (JobPO jobPO : firstChildJobList) {
-        //    // 刷新组织架构图
-        //     new JobTriggerRunnable(jobPO.getId()).run();
-        //}
         // 更新当前部门下的人员
         rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?", targetDepartment.getSubCompanyId1(), targetEcDeptId, mergeEcDeptId);
-        //new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? ,department_id = ?, ec_department = ?where department_id =?", targetDepartment.getParentComp(), targetDepartment.getEcCompany(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId());
-        //List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeParam.getId().toString());
-        //// 更新人员组织架构图
-        //for (Long hrmResourceId : hrmResourceIds) {
-        //   new HrmResourceTriggerRunnable(hrmResourceId).run();
-        //}
+
         // 更新子部门下岗位的所属分部
         for (DepartmentPO departmentPO : firstChildDeptList) {
             List<DepartmentPO> deptList = getDepartmentMapper().getDeptListByPId(departmentPO.getId());
             forbiddenChildTag(targetDepartment.getSubCompanyId1(), deptList);
         }
-        // 原部门删除
-        // DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId());
+
         // 删除部门（先更改原部门名称，释放原部门名称，然后删除）
         DepartmentPO sourceDepartmentPO = getDepartmentMapper().getDeptById(mergeParam.getId());
-        sourceDepartmentPO.setDepartmentName(sourceDepartmentPO.getDepartmentName() + "_被合并");
-        sourceDepartmentPO.setDepartmentMark(sourceDepartmentPO.getDepartmentMark() + "_被合并");
+        sourceDepartmentPO.setDepartmentName(sourceDepartmentPO.getDepartmentName() + SystemEnv.getHtmlLabelName(547272,user.getLanguage()));
+        sourceDepartmentPO.setDepartmentMark(sourceDepartmentPO.getDepartmentMark() + SystemEnv.getHtmlLabelName(547272,user.getLanguage()));
         updateEcDepartment(sourceDepartmentPO);
         Map<String, Object> map = new HashMap<>();
         map.put("id", Util.null2String(mergeParam.getId()));
@@ -593,14 +556,12 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         // 删除原部门下的岗位
 
 
-        // 更新组织架构图
-        //  new DepartmentTriggerRunnable(mergeDepartment).run();
+
         // 更新部门合并后名称
         targetDepartment.setDepartmentName(mergeParam.getMergeName());
         targetDepartment.setDepartmentMark(mergeParam.getMergeName());
         updateEcDepartment(targetDepartment);
-        // 更新组织架构图
-        //  new DepartmentTriggerRunnable(oldFParentId, targetDepartment.getId()).run();
+
         return 0;
     }
 
@@ -608,8 +569,8 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     public List<SearchConditionGroup> getMoveForm() {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "选择分部", "164", "company", "");
-        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "选择部门", "4", "department", "");
+        SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547273, "164", "company", "");
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547274, "4", "department", "");
 
 
         List<SearchConditionOption> selectOptions = new ArrayList<>();
@@ -617,7 +578,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         SearchConditionOption deptOption = new SearchConditionOption("1", "部门");
         selectOptions.add(compOption);
         selectOptions.add(deptOption);
-        SearchConditionItem moveTypeItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "转移到", "moveType");
+        SearchConditionItem moveTypeItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547275, "moveType");
         moveTypeItem.setDetailtype(3);
         moveTypeItem.setValue("0");
 
@@ -631,47 +592,34 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
     @Override
     public int moveDepartment(DepartmentMoveParam moveParam) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notBlank(moveParam.getMoveType(), "请选择转移类型");
+        OrganizationAssert.notBlank(moveParam.getMoveType(), SystemEnv.getHtmlLabelName(547276,user.getLanguage()));
         DepartmentPO deptById = getDepartmentMapper().getDeptById(moveParam.getId());
         // 0：公司/分部 1：部门
         if ("0".equals(moveParam.getMoveType())) {
             Integer company = moveParam.getCompany();
-            OrganizationAssert.notNull(company, "请选择要转移到的分部");
+            OrganizationAssert.notNull(company, SystemEnv.getHtmlLabelName(547277,user.getLanguage()));
             deptById.setSubCompanyId1(company);
             deptById.setSupDepId(null);
-
-            // 更新组织架构图
-            // new DepartmentTriggerRunnable(company.toString(), deptById).run();
         } else if ("1".equals(moveParam.getMoveType())) {
             Integer departmentId = moveParam.getDepartment();
-            OrganizationAssert.notNull(departmentId, "请选择要转移到的部门");
+            OrganizationAssert.notNull(departmentId, SystemEnv.getHtmlLabelName(547278,user.getLanguage()));
             List<DepartmentPO> deptListByPId = getDepartmentMapper().getDeptListByPId(moveParam.getId());
             Set<Integer> disableIds = new HashSet<>();
             disableIds.add(moveParam.getId());
             if (CollectionUtils.isNotEmpty(deptListByPId)) {
                 addDisableIds(disableIds, deptListByPId);
             }
-            OrganizationAssert.isFalse(disableIds.contains(departmentId), "请勿选择当前部门本身及其子部门");
+            OrganizationAssert.isFalse(disableIds.contains(departmentId), SystemEnv.getHtmlLabelName(547271,user.getLanguage()));
             deptById.setSupDepId(departmentId);
             DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(departmentId);
             deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1());
-
-            // 更新组织架构图
-            //  new DepartmentTriggerRunnable(Integer.toString(100000000 + department.intValue()), deptById).run();
         }
         // 更新EC部门
         updateEcDepartment(deptById);
 
-        // 刷新岗位分部
-        //refreshJobComp(deptById.getId(), deptById.getSubCompanyId1());
+
         List<DepartmentPO> deptList = getDepartmentMapper().getDeptListByPId(deptById.getId());
-        // 更新当前部门下的人员
-        // new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =?  where DEPARTMENTID = ?", deptById.getSubCompanyId1(), deptById.getId());
-        //// 更新人员组织架构图
-        //List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(deptById.getId().toString());
-        //for (Long hrmResourceId : hrmResourceIds) {
-        //    new HrmResourceTriggerRunnable(hrmResourceId).run();
-        //}
+
         forbiddenChildTag(deptById.getSubCompanyId1(), deptList);
         // 递归更新下级部门、岗位
         return 1;
@@ -695,8 +643,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         String supId = "";
         String ftype = "";
         String querySupIdSql;
-//        OrganizationAssert.isFalse("s".equals(sourceType) && "d".equals(targetType), "分部不能转移到部门下");
-        OrganizationAssert.isFalse("-1".equals(dragPostion), "分部、部门不能转移至与集团平级");
+        OrganizationAssert.isFalse("-1".equals(dragPostion), SystemEnv.getHtmlLabelName(547279,user.getLanguage()));
         if ("s".equals(targetType)) {// 分部
             querySupIdSql = "select companyId as supComId,supsubcomid as supId,'s' as ftype from hrmsubcompany where id = ?";
         } else {
@@ -713,7 +660,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             Map<String, Object> params = new HashMap<>();
             params.put("id", sourceId);
             if ("0".equals(dragPostion)) {//内部
-                OrganizationAssert.isFalse("d".equals(targetType), "分部不能拖拽至部门下");
+                OrganizationAssert.isFalse("d".equals(targetType), SystemEnv.getHtmlLabelName(547280,user.getLanguage()));
                 if ("c".equals(targetType)) {// 集团下（上级分部为0）
                     params.put("supsubcomid", "0");
                 } else if ("s".equals(targetType)) {
@@ -723,7 +670,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
                 if ("s".equals(targetType)) {// 分部外（平级）
                     params.put("supsubcomid", supId);
                 } else {// 部门外（找上级）
-                    OrganizationAssert.isFalse("d".equals(ftype), "分部不能拖拽至部门下");
+                    OrganizationAssert.isFalse("d".equals(ftype), SystemEnv.getHtmlLabelName(547280,user.getLanguage()));
                     params.put("supsubcomid", supId);
                 }
             }
@@ -732,7 +679,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
             List<DepartmentPO> deptListByPId;
             Set<Integer> disableIds = new HashSet<>();
             if ("0".equals(dragPostion)) {//内部
-                OrganizationAssert.isFalse("c".equals(targetType), "部门不能拖拽至集团下");
+                OrganizationAssert.isFalse("c".equals(targetType), SystemEnv.getHtmlLabelName(547281,user.getLanguage()));
                 if ("s".equals(targetType)) {
                     deptById.setSubCompanyId1(Util.getIntValue(targetId));
                     deptById.setSupDepId(null);
@@ -742,14 +689,14 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
                     if (CollectionUtils.isNotEmpty(deptListByPId)) {
                         addDisableIds(disableIds, deptListByPId);
                     }
-                    OrganizationAssert.isFalse("d".equals(targetType) && disableIds.contains(Util.getIntValue(targetId)), "请勿选择当前部门本身及其子部门");
+                    OrganizationAssert.isFalse("d".equals(targetType) && disableIds.contains(Util.getIntValue(targetId)), SystemEnv.getHtmlLabelName(547271,user.getLanguage()));
                     deptById.setSupDepId(Util.getIntValue(targetId));
                     DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(Util.getIntValue(targetId));
                     deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1());
                 }
             } else {//外部
                 if ("s".equals(targetType)) {
-                    OrganizationAssert.isFalse("0".equals(supId), "部门不能拖拽至集团下");
+                    OrganizationAssert.isFalse("0".equals(supId), SystemEnv.getHtmlLabelName(547281,user.getLanguage()));
                     deptById.setSubCompanyId1(Util.getIntValue(supId));
                     deptById.setSupDepId(null);
                 } else {
@@ -785,19 +732,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
                 // 更新EC表部门
                 updateEcDepartment(departmentPO);
 
-                // 更新组织架构图
-                //  new DepartmentTriggerRunnable(departmentPO.getId()).run();
-                // 刷新岗位所属分部
-                //refreshJobComp(departmentPO.getId(), subCompanyId1);
-                // 更新当前部门下的人员
-                // String ecDepartmentId = EcHrmRelationUtil.getEcDepartmentId(departmentPO.getId().toString());
-                //new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =?  where DEPARTMENTID = ?", ecCompanyId, ecDepartmentId);
-                //new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? where department_id =?", parentComp, ecCompanyId, departmentPO.getId());
-                //List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(departmentPO.getId().toString());
-                //// 更新人员组织架构图
-                //for (Long hrmResourceId : hrmResourceIds) {
-                //    new HrmResourceTriggerRunnable(hrmResourceId).run();
-                //}
                 List<DepartmentPO> childList = getDepartmentMapper().getDeptListByPId(departmentPO.getId());
                 forbiddenChildTag(subCompanyId1, childList);
             }
@@ -859,23 +793,6 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         }
     }
 
-    /**
-     * 判断编号是否重复
-     *
-     * @return
-     */
-    public static String repeatDetermine(String deptNo) {
-        CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.DEPARTMENT.getValue());
-        if (StringUtils.isNotBlank(deptNo)) {
-            deptNo = CodeRuleUtil.generateCode(RuleCodeType.DEPARTMENT, deptNo);
-            List<DepartmentPO> list = getDepartmentMapper().listByNo(Util.null2String(deptNo));
-            OrganizationAssert.isEmpty(list, "编号不允许重复");
-        } else {
-            OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
-            deptNo = autoCreateCompanyNo();
-        }
-        return deptNo;
-    }
 
     /**
      * 自动编号处理
@@ -935,19 +852,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         }
     }
 
-    /**
-     * 更新岗位的所属分部
-     *
-     * @param parentDepartment
-     * @param parentComp
-     */
-    private void refreshJobComp(Integer parentDepartment, Integer parentComp) {
-        List<JobPO> jobPOS = getJobMapper().listJobsByDepartmentId(parentDepartment);
-        jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(jobPOS)) {
-            getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, parentComp);
-        }
-    }
+
 
     private List<SearchConditionGroup> getDepartmentConditionGroups(Boolean showAll, Map<String, Object> params) {
         List<SearchConditionGroup> groupList = new ArrayList<>();

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

@@ -15,7 +15,6 @@ import com.engine.organization.entity.department.dto.DepartmentListDTO;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
 import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
-import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.mapper.resource.HrmResourceMapper;
 import com.engine.organization.mapper.resource.ResourceMapper;
@@ -28,6 +27,8 @@ import com.engine.organization.util.excel.ExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -104,7 +105,7 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
         List<String> headerList = new ArrayList<>();
         List<Object> headerNameList = new ArrayList<>();
         OrganizationWeaTable<HrmResourceVO> table = new OrganizationWeaTable<>(user, HrmResourceVO.class);
-        String sqlWhere = " where 1 = 1 and t.status < 4 and (t.accounttype is null or t.accounttype != 1)";
+        String sqlWhere = " where 1 = 1 and (t.accounttype is null or t.accounttype != 1)";
         // 分权查询
         DetachUtil detachUtil = new DetachUtil(user);
         String parentCompanyIds = detachUtil.getJclRoleLevels();
@@ -146,7 +147,7 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
                 String scopeId = columnName.split("_")[0];
                 String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
                 WeaTableColumn weaTableColumn = new WeaTableColumn();
-                weaTableColumn.setText(MapperProxyFactory.getProxy(HrmResourceMapper.class).queryLabelName(fieldName, scopeId));
+                weaTableColumn.setText(MapperProxyFactory.getProxy(HrmResourceMapper.class).queryLabelName(fieldName, scopeId, user.getLanguage()));
                 weaTableColumn.setColumn(hrmResourceService.buildTableSql(columnName).replace(".", "_"));
                 weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
                 weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
@@ -215,10 +216,11 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
 
     @Override
     public XSSFWorkbook departmentExport() {
+        SubCompanyComInfo subCompanyComInfo = new SubCompanyComInfo();
+        DepartmentComInfo departmentComInfo = new DepartmentComInfo();
         String orderSql = PageInfoSortUtil.getSortSql("", " showorder ");
         List<DepartmentPO> allList = getDepartmentMapper().listAll(orderSql);
         new DetachUtil(user).filterDepartmentList(allList);
-        Map<Integer, DepartmentPO> poMaps = allList.stream().collect(Collectors.toMap(DepartmentPO::getId, item -> item));
         List<DepartmentListDTO> dtoList = allList.stream().map(e ->
                 DepartmentListDTO
                         .builder()
@@ -226,8 +228,10 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
                         .departmentMark(e.getDepartmentMark())
                         .departmentName(e.getDepartmentName())
                         .departmentCode(e.getDepartmentCode())
-                        .subCompanyName(0 == e.getSubCompanyId1() ? "" : MapperProxyFactory.getProxy(CompMapper.class).listById(e.getSubCompanyId1()).getSubCompanyName())
-                        .supDepName(null == poMaps.get(e.getSupDepId()) ? "" : poMaps.get(e.getSupDepId()).getDepartmentName())
+                        .subCompanyId1(e.getSubCompanyId1())
+                        .supDepId(e.getSupDepId())
+                        .subCompanyName((null == e.getSubCompanyId1() || 0 == e.getSubCompanyId1()) ? "" : subCompanyComInfo.getSubCompanyname(Util.null2String(e.getSubCompanyId1())))
+                        .supDepName((null == e.getSupDepId() || 0 == e.getSupDepId()) ? "" : departmentComInfo.getDepartmentname(Util.null2String(e.getSupDepId())))
                         .bmfzr(DepartmentBO.getEmployeeNameById(e.getId()))
                         .canceled(null == e.getCanceled() ? 0 : e.getCanceled())
                         .build()).collect(Collectors.toList());

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

@@ -296,14 +296,11 @@ public class ExtServiceImpl extends Service implements ExtService {
         List<Long> groupIds = dtInfoPOList.stream().map(ExtendInfoPO::getExtendGroupId).distinct().collect(Collectors.toList());
         Map<Long, List<ExtendInfoPO>> poMaps = dtInfoPOList.stream().collect(Collectors.groupingBy(ExtendInfoPO::getExtendGroupId));
 
-        boolean deleteFlag = true;
         for (Long groupId : groupIds) {
             int rowNum = Util.getIntValue((String) params.get("rownum" + groupId));
-            if (deleteFlag && rowNum > 0) {
-                // 删除原有明细表数据
-                getExtDTMapper().deleteByMainID(tableName, id, groupId);
-                deleteFlag = false;
-            }
+            // 删除原有明细表数据
+            getExtDTMapper().deleteByMainID(tableName, id, groupId);
+
             List<ExtendInfoPO> filterS = poMaps.get(groupId);
             for (int i = 0; i < rowNum; i++) {
                 Map<String, Object> map = new HashMap<>();
@@ -319,6 +316,9 @@ public class ExtServiceImpl extends Service implements ExtService {
                 map.put("delete_type", 0);
                 map.put("create_time", new Date());
                 map.put("update_time", new Date());
+                // 去除value为null的元素
+                map.entrySet().removeIf(entry -> entry.getValue() == null);
+
                 getExtDTMapper().insertCompExtDT(tableName, map);
             }
         }

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

@@ -94,9 +94,12 @@ public class FunctionOutStaffServiceImpl {
                 .sum();
         staffPO.setPermanentNum(sum);
         Integer sums = staffPO.getPermanentNum() + staffPO.getFreezeNum();
+
         //强控策略下不容许超编
         if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
-            OrganizationAssert.isFalse(sums.compareTo(staffPO.getStaffNum()) > 0,"强控策略下不容许超编");
+            //冻结数释放
+            OrganizationAssert.isFalse((sums > staffPO.getStaffNum() && staffPO.getFreezeNum() > 0),"强控策略下请先释放当前冻结数后再完成入职操作");
+            OrganizationAssert.isFalse( sums > staffPO.getStaffNum(),"强控策略下不容许超编");
         }
         //向上部门 分部在编数调整
         upwardReviewSums(param);

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

@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.StringUtil;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 
@@ -74,7 +75,7 @@ public class GradeServiceImpl extends Service implements GradeService {
     @Override
     public int saveGrade(GradeSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getGradeNo(), null), "同一等级方案下编号不能重复");
+        OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getGradeNo(), null), SystemEnv.getHtmlLabelName(547177, user.getLanguage()));
         GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID());
         return getGradeMapper().insertIgnoreNull(gradePO);
     }
@@ -83,7 +84,7 @@ public class GradeServiceImpl extends Service implements GradeService {
     public int updateGrade(GradeSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         GradePO gradePO = GradeDTO.convertParamToPO(param, (long) user.getUID());
-        OrganizationAssert.isTrue(checkRepeatNo(gradePO.getSchemeId(), gradePO.getGradeNo(), gradePO.getId()), "同一等级方案下编号不能重复");
+        OrganizationAssert.isTrue(checkRepeatNo(gradePO.getSchemeId(), gradePO.getGradeNo(), gradePO.getId()), SystemEnv.getHtmlLabelName(547177, user.getLanguage()));
         return getGradeMapper().updateGrade(gradePO);
     }
 
@@ -97,7 +98,7 @@ public class GradeServiceImpl extends Service implements GradeService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getGradeMapper().deleteByIds(ids);
     }
 
@@ -107,8 +108,8 @@ public class GradeServiceImpl extends Service implements GradeService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
-        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
-        SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "gradeName");
+        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547124, "161", "schemeId", "schemeBrowser");
+        SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "gradeName");
         conditionItems.add(browserItem);
         conditionItems.add(gradeNameCondition);
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
@@ -125,12 +126,12 @@ public class GradeServiceImpl extends Service implements GradeService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         String id = Util.null2String(params.get("id"));
         String schemeId = Util.null2String(params.get("schemeId"));
-        SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "gradeName");
+        SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "gradeName");
         gradeNameCondition.setRules("required|string");
-        SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "gradeNo");
+        SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "gradeNo");
         gradeNoCondition.setRules("required|string");
-        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
-        SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
+        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description");
+        SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547124, "161", "schemeId", "schemeBrowser");
         schemeBrowserItem.setRules("required|string");
         BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam();
         if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId) && StringUtil.isEmpty(id)) {
@@ -139,13 +140,13 @@ public class GradeServiceImpl extends Service implements GradeService {
             schemeBrowserBean.setReplaceDatas(maps);
             schemeBrowserItem.setBrowserConditionParam(schemeBrowserBean);
         }
-        SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职等", "162", "levelId", "LevelBrowser");
+        SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547139, "162", "levelId", "LevelBrowser");
         levelBrowserItem.setRules("required|string");
 
         // 编辑状态下赋值操作
         if (!StringUtil.isEmpty(id)) {
             GradePO gradePO = getGradeMapper().getGradeByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(gradePO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(gradePO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
 
             gradeNameCondition.setValue(gradePO.getGradeName());
             gradeNoCondition.setValue(gradePO.getGradeNo());
@@ -198,16 +199,16 @@ public class GradeServiceImpl extends Service implements GradeService {
 
     @Override
     public Map<String, List<MenuBtn>> getHasRight() {
-        return MenuBtn.getCommonBtnDatas();
+        return MenuBtn.getCommonBtnDatas(user.getLanguage());
     }
 
     @Override
     public Map<String, Object> getTabInfo() {
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
-        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());
-        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build());
-        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build());
+        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title(SystemEnv.getHtmlLabelName(547191, user.getLanguage())).viewCondition("-1").build());
+        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).viewCondition("0").build());
+        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title(SystemEnv.getHtmlLabelName(547192, user.getLanguage())).viewCondition("1").build());
         apiDatas.put("topTabs", topTabs);
 
         HashMap<String, Integer> countMap = new HashMap<>();

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

@@ -62,6 +62,7 @@ import weaver.general.StringUtil;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
 import weaver.hrm.definedfield.HrmFieldManager;
+import weaver.systeminfo.SystemEnv;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -69,7 +70,6 @@ import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 import static weaver.general.Util.getIntValue;
 
@@ -183,7 +183,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             String scopeId = columnName.split("_")[0];
             String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
             WeaTableColumn weaTableColumn = new WeaTableColumn();
-            weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId));
+            weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId,user.getLanguage()));
             weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
 
             weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
@@ -574,8 +574,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
             rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
         }
-        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").build());
-        rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName(SystemEnv.getHtmlLabelName(547136,user.getLanguage())).type("BTN_COLUMN").build());
+        rightMenuList.add(MenuBtn.rightMenu_btnLog(user.getLanguage()));
         btnDatas.put("topMenu", topMenuList);
         btnDatas.put("rightMenu", rightMenuList);
         btnDatas.put("hasRight", true);
@@ -588,64 +588,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         OrganizationAssert.notBlank(viewAttrStr, "未指定操作类型，请确认");
         String id = Util.null2String(params.get("id"));
         OrganizationAssert.notBlank(id, "数据有误，请确认");
-        int viewAttr = Integer.parseInt(viewAttrStr);
         Map<String, Object> apiDatas = new HashMap<>();
-
-        //List<SearchConditionGroup> addGroups = new ArrayList<>();
-        //SearchConditionItem schemeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "等级方案", "161", "schemeId", "schemeBrowser");
-        //schemeId.setRules("required");
-        //SearchConditionItem gradeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职级", "161", "gradeId", "gradeBrowser");
-        //gradeId.setRules("required");
-        //SearchConditionItem levelId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职等", "162", "levelId", "levelBrowser");
-        //levelId.setRules("required");
-        //SearchConditionItem sequenceId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位序列", "161", "sequenceId", "sequenceBrowser");
-        //sequenceId.setRules("required");
-        //SearchConditionItem postId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务分类", "161", "postId", "postBrowser");
-        //postId.setRules("required");
-        //SearchConditionItem postInfoId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务信息", "161", "postInfoId", "postInfoBrowser");
-        //postInfoId.setRules("required");
-        //SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "分部", "164", "companyId", "");
-        //companyId.setRules("required");
-        //SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "部门", "4", "departmentId", "");
-        //departmentId.setRules("required");
-        //SearchConditionItem jobId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位", "161", "jobId", "jobBrowser");
-        //jobId.setRules("required");
-        //
-        //
-        //// 编辑状态下赋值操作
-        //HrmRelationPO relationPO = getHrmRelationMapper().getRelationById(Long.parseLong(id));
-        //if (null != relationPO) {
-        //    setBrowserValue(schemeId, relationPO.getSchemeId(), getSchemeMapper().listSchemesByIds(Stream.of(relationPO.getSchemeId()).collect(Collectors.toList())), null, null);
-        //    setBrowserValue(gradeId, relationPO.getGradeId(), getGradeMapper().listGradessByIds(Stream.of(relationPO.getGradeId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId());
-        //    setBrowserValue(levelId, relationPO.getLevelId(), getLevelMapper().listLevelsByIds(DeleteParam.builder().ids(relationPO.getLevelId()).build().getIds()), "grade_id", relationPO.getGradeId());
-        //    setBrowserValue(sequenceId, relationPO.getSequenceId(), getSequenceMapper().listSequencesByIds(Stream.of(relationPO.getSequenceId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId());
-        //    setBrowserValue(postId, relationPO.getPostId(), getPostMapper().listPostsByIds(Stream.of(relationPO.getPostId()).collect(Collectors.toList())), null, null);
-        //    setBrowserValue(postInfoId, relationPO.getPostInfoId(), getPostInfoMapper().listPostInfosByIds(Stream.of(relationPO.getPostInfoId()).collect(Collectors.toList())), "post_id", relationPO.getPostId());
-        //
-        //    List<Map<String, Object>> companyMaps = new ArrayList<>();
-        //    String scCompanyNameById = MapperProxyFactory.getProxy(SystemDataMapper.class).getScCompanyNameById(relationPO.getCompanyId().toString());
-        //    Map<String, Object> companyMap = new HashMap<>();
-        //    companyMap.put(relationPO.getCompanyId().toString(), scCompanyNameById);
-        //    companyMaps.add(companyMap);
-        //    setBrowserValue(companyId, relationPO.getCompanyId(), companyMaps, null, null);
-        //
-        //    List<Map<String, Object>> departmentMaps = new ArrayList<>();
-        //    String departmentNameById = MapperProxyFactory.getProxy(SystemDataMapper.class).getScDepartmentNameById(relationPO.getDepartmentId().toString());
-        //    Map<String, Object> departmentMap = new HashMap<>();
-        //    departmentMap.put(relationPO.getDepartmentId().toString(), departmentNameById);
-        //    departmentMaps.add(departmentMap);
-        //    setBrowserValue(departmentId, relationPO.getDepartmentId(), departmentMaps, "subcompany1", relationPO.getCompanyId());
-        //
-        //    setBrowserValue(jobId, relationPO.getJobId(), getJobMapper().listJobsByIds(Stream.of(relationPO.getJobId()).collect(Collectors.toList())), "departmentid", relationPO.getDepartmentId());
-        //}
-        //
-        //addGroups.add(new SearchConditionGroup("岗职位体系", true, Stream.of(schemeId, gradeId, levelId, sequenceId, postId, postInfoId).collect(Collectors.toList())));
-        //addGroups.add(new SearchConditionGroup("组织机构", true, Stream.of(companyId, departmentId, jobId).collect(Collectors.toList())));
-        //HashMap<String, Object> buttonsMap = new HashMap<>();
-        //buttonsMap.put("hasEdit", true);
-        //buttonsMap.put("hasSave", true);
-        //apiDatas.put("buttons", buttonsMap);
-        //apiDatas.put("conditions", addGroups);
         return apiDatas;
     }
 
@@ -686,7 +629,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         infoPOList.add(ExtendInfoPO.builder().viewAttr(1).id(null).fieldName("createTime").fieldNameDesc("创建时间").fieldType("date").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
         Map<String, Object> tabInfoMap = new HashMap<>();
         tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, false, true));
-        List<JclOrgCustomTemplatePO> jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAll();
+        List<JclOrgCustomTemplatePO> jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAllByCreator(user.getUID());
         List<Integer> isUsed = new ArrayList<>();
         AtomicInteger index = new AtomicInteger(0);
         List<Map<String, Object>> collect = jclOrgCustomTemplatePOS.stream().map(item -> {
@@ -713,15 +656,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         tabInfoMap.put("selectedData", isUsedMap);
         tabInfoMap.put("isModalEdit", false);
         return tabInfoMap;
-
-
-//        OrganizationWeaTable<JclOrgCustomTemplateVO> table = new OrganizationWeaTable<>(user, JclOrgCustomTemplateVO.class);
-//        String sqlWhere = buildSqlWhere(params);
-//        table.setSqlwhere(sqlWhere);
-//        WeaResultMsg result = new WeaResultMsg(false);
-//        result.putAll(table.makeDataResult());
-//        result.success();
-//        return new HashMap<>(result.getResultMap());
     }
 
     /**
@@ -1315,7 +1249,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<SearchConditionOption> options = searchConditionItem.getOptions();
         SearchConditionOption searchConditionOption = new SearchConditionOption();
         searchConditionOption.setKey("-1");
-        searchConditionOption.setShowname("全部");
+        searchConditionOption.setShowname(SystemEnv.getHtmlLabelName(547191,user.getLanguage()));
         options.add(0, searchConditionOption);
         options.forEach(item -> item.setSelected(false));
     }

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

@@ -27,6 +27,7 @@ import com.engine.organization.util.HasRightUtil;
 import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.excel.ExcelUtil;
+import com.engine.organization.util.field.StaticFieldName;
 import com.engine.organization.util.saveimport.CompanyImport;
 import com.engine.organization.util.saveimport.DepartmentImport;
 import com.engine.organization.util.saveimport.OrgImportUtil;
@@ -117,6 +118,8 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                     excludeFields.add("companyworkyear");
                     excludeFields.add("textfield1");
                     excludeFields.add("textfield2");
+                    // 职等职级
+                    excludeFields.add("3" + StaticFieldName.zdzjFieldName);
 
                     return ResourceImport.getImportFields(user, excludeFields);
                 case "joblevel":
@@ -329,10 +332,17 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
             item.put("value", value);
             itemList.add(item);
         }
-        Map<String, Object> item = new HashMap<>();
-        item.put("index", 3);
-        item.put("value", "多个职等之间使用英文状态下逗号”,“隔开");
+        Map<String, Object> item = new HashMap<String, Object>(2){{
+            put("index", 3);
+            put("value", "多个职等之间使用英文状态下逗号”,“隔开");
+        }};
+        Map<String, Object> item1 = new HashMap<String, Object>(2){{
+            put("index", 4);
+            put("value", "《等级方案、职等、职级》名称存在重复情况下暂时不支持导入功能");
+        }};
         itemList.add(item);
+        itemList.add(item1);
+
         groupItem.put("items", itemList);
         lsGroup.add(groupItem);
         return lsGroup;

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

@@ -55,6 +55,7 @@ import org.apache.commons.lang.StringUtils;
 import weaver.general.StringUtil;
 import weaver.general.Util;
 import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -168,13 +169,13 @@ public class JobServiceImpl extends Service implements JobService {
                 jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
-            pageInfos = new PageInfo<>(subList, JobListDTO.class);
+            pageInfos = new PageInfo<>(user, subList, JobListDTO.class);
             pageInfos.setTotal(jobListDTOS.size());
         } else {
             // 组合list
             List<JobListDTO> jobListDTOS = JobBO.buildDTOList(allList);
             List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
-            pageInfos = new PageInfo<>(subList, JobListDTO.class);
+            pageInfos = new PageInfo<>(user, subList, JobListDTO.class);
             pageInfos.setTotal(jobListDTOS.size());
         }
 
@@ -201,15 +202,16 @@ public class JobServiceImpl extends Service implements JobService {
         Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
+        int userLanguage = user.getLanguage();
         // 批量删除
-        topMenuList.add(MenuBtn.topMenu_batchDelete());
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
-        topMenuList.add(MenuBtn.topMenu_addNew());
+        topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName(SystemEnv.getHtmlLabelName(547432,userLanguage)).type("BTN_REFRESH").build());
+        topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
         btnDatas.put("topMenu", topMenuList);
         // 日志
-        rightMenuList.add(MenuBtn.rightMenu_btnLog());
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
-        rightMenuList.add(MenuBtn.rightMenu_addNew());
+        rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName(SystemEnv.getHtmlLabelName(547432,userLanguage)).type("BTN_REFRESH").build());
+        rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }
@@ -220,29 +222,22 @@ public class JobServiceImpl extends Service implements JobService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
         // 编号
-        SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "jobNo");
+        SearchConditionItem jobNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "jobNo");
         // 名称
-        SearchConditionItem jobTitleNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "jobTitleName");
+        SearchConditionItem jobTitleNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "jobTitleName");
         // 所属分部
-        SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属分部", "164", "subcompanyid1", "");
+        SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "subcompanyid1", "");
         // 所属部门
-        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "departmentid", "");
+        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547431, "4", "departmentid", "");
         // 是否关键岗
         List<SearchConditionOption> isKeyOptions = new ArrayList<>();
-        SearchConditionOption yesOption = new SearchConditionOption("0", "否");
-        SearchConditionOption noOption = new SearchConditionOption("1", "是");
+        SearchConditionOption yesOption = new SearchConditionOption("0", SystemEnv.getHtmlLabelName(547419,user.getLanguage()));
+        SearchConditionOption noOption = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547420,user.getLanguage()));
         isKeyOptions.add(yesOption);
         isKeyOptions.add(noOption);
-        SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey");
+        SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, 547417, "isKey");
         // 工作地点
-        SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace");
-        // 禁用标记
-        //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");
+        SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547418, "workplace");
 
         conditionItems.add(jobNoItem);
         conditionItems.add(jobTitleNameItem);
@@ -250,7 +245,6 @@ public class JobServiceImpl extends Service implements JobService {
         conditionItems.add(parentDeptBrowserItem);
         conditionItems.add(isKeyItem);
         conditionItems.add(workplaceItem);
-        //conditionItems.add(forbiddenTagItem);
 
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
         apiDatas.put("conditions", addGroups);
@@ -305,7 +299,7 @@ public class JobServiceImpl extends Service implements JobService {
 
     @Override
     public Map<String, Object> getJobBaseForm(Map<String, Object> params) {
-        OrganizationAssert.notNull(params.get("viewAttr"), "请标识操作类型");
+        OrganizationAssert.notNull(params.get("viewAttr"), SystemEnv.getHtmlLabelName(547260,user.getLanguage()));
 
         // 2编辑 1查看
         int viewAttr = Integer.parseInt((String) params.get("viewAttr"));
@@ -359,10 +353,6 @@ public class JobServiceImpl extends Service implements JobService {
     public Long saveBaseForm(Map<String, Object> params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class);
-        //String jobNo = (String) params.get("job_no");
-        //// 判断是否开启自动编号
-        //jobNo = repeatDetermine(jobNo);
-        //params.put("job_no", jobNo);
         params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey());
         if (null != searchParam.getParentJob()) {
             JobPO parentJob = getJobMapper().getJobById(searchParam.getParentJob());
@@ -385,14 +375,12 @@ public class JobServiceImpl extends Service implements JobService {
         // 判断岗位是否重复
         ResourcePO build = ResourcePO.builder().subcompanyid1(Integer.parseInt(Util.null2String(params.get("ec_company")))).departmentid(Integer.parseInt(Util.null2String(params.get("ec_department")))).jobtitle(Integer.parseInt(Util.null2String(params.get("ec_jobTitle")))).build();
         int count = getJobMapper().selectByConditions(build);
-        OrganizationAssert.isTrue(count <= 0, "已存在相同维度岗位,请勿重复添加");
+        OrganizationAssert.isTrue(count <= 0, SystemEnv.getHtmlLabelName(547421,user.getLanguage()));
 
         String jobNo = (String) params.get("job_no");
         // 判断是否开启自动编号
         jobNo = repeatDetermine(jobNo);
         params.put("job_no", jobNo);
-        //params.put("jobactivityid", JOB_ACTIVITY_ID);
-        //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.ADD, params).sync();
         return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);
     }
 
@@ -405,7 +393,7 @@ public class JobServiceImpl extends Service implements JobService {
         // 上级岗位不能选择本身
         String parent_job = Util.null2String(params.get("parent_job"));
         if (StringUtils.isNotBlank(parent_job)) {
-            OrganizationAssert.isFalse(parent_job.equals(searchParam.getId().toString()), "上级岗位不能选择本身");
+            OrganizationAssert.isFalse(parent_job.equals(searchParam.getId().toString()), SystemEnv.getHtmlLabelName(547422,user.getLanguage()));
         }
         if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) {
             JobPO oldJobPO = getJobMapper().getJobById(searchParam.getId());
@@ -441,7 +429,7 @@ public class JobServiceImpl extends Service implements JobService {
     @Override
     public int copyJobItem(String ids, String department) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notBlank(department, "请指定需要复制的部门");
+        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();
@@ -462,8 +450,6 @@ public class JobServiceImpl extends Service implements JobService {
             jobById.setParentJob(null);
             jobById.setShowOrder(orderNum);
             insertCount += getJobMapper().insertIgnoreNull(jobById);
-            // 更新组织架构图
-            // new JobTriggerRunnable(jobById.getId()).run();
         }
 
         return insertCount;
@@ -477,35 +463,29 @@ public class JobServiceImpl extends Service implements JobService {
         if (params.getForbiddenTag()) {
             // 启用：判断上级部门是否启用，上级部门启用，岗位才可启用
             DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(jobById.getEcDepartment());
-            OrganizationAssert.isTrue(0 == parentDepartment.getCanceled(), "该岗位不能解封，请先解封上级部门");
+            OrganizationAssert.isTrue(0 == parentDepartment.getCanceled(), SystemEnv.getHtmlLabelName(547424,user.getLanguage()));
 
             // 启用：判断上级岗位是否启用，上级岗位启用，岗位才可启用
             if (null != jobById.getParentJob()) {
                 JobPO parentJob = getJobMapper().getJobById(jobById.getParentJob());
-                OrganizationAssert.isTrue(0 == parentJob.getForbiddenTag(), "该岗位不能解封，请先解封上级岗位");
+                OrganizationAssert.isTrue(0 == parentJob.getForbiddenTag(), SystemEnv.getHtmlLabelName(547436,user.getLanguage()));
             }
         } else {
-            //禁用：判断当前岗位下是否有人员，如有人员则不能禁用
-            // int hasResource = getJobMapper().isHasResource(params.getId());
-            // OrganizationAssert.isTrue(hasResource == 0, "该岗位存在人员，不能封存");
-            throw new OrganizationRunTimeException("该岗位不能封存");
+            throw new OrganizationRunTimeException(SystemEnv.getHtmlLabelName(547425,user.getLanguage()));
         }
-        //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobPO).sync();
         return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag());
     }
 
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         List<JobPO> jobsByIds = getJobMapper().getJobsByIds(ids);
         for (JobPO jobsById : jobsByIds) {
             // 判断是否可以删除
             List<String> allowDelete = getJobMapper().isAllowDelete(jobsById.getId());
-            OrganizationAssert.isTrue(CollectionUtils.isEmpty(allowDelete), "该岗位存在引用，不允许删除");
+            OrganizationAssert.isTrue(CollectionUtils.isEmpty(allowDelete), SystemEnv.getHtmlLabelName(547426,user.getLanguage()));
 
-            // jobsById.setForbiddenTag(1);
-            //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobsById).sync();
             // 删除拓展表、明细表
             MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_jobext", jobsById.getId());
             MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_jobext_dt1", jobsById.getId(), null);
@@ -536,7 +516,7 @@ public class JobServiceImpl extends Service implements JobService {
     public List<SearchConditionGroup> getMergeForm(Long id) {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到岗位", "666", "targetJob", "");
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547427, "666", "targetJob", "");
         deptBrowserItem.setRules("required");
         BrowserBean browserBean = deptBrowserItem.getBrowserConditionParam();
         String s = JSONObject.toJSONString(browserBean);
@@ -544,7 +524,7 @@ public class JobServiceImpl extends Service implements JobService {
         customBrowserBean.setHasLeftTree(true);
         customBrowserBean.setLeftToSearchKey("treeKey");
         deptBrowserItem.setBrowserConditionParam(customBrowserBean);
-        SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName");
+        SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547265, "mergeName");
         mergeNameItem.setRules("required|string");
         condition.add(deptBrowserItem);
         condition.add(mergeNameItem);
@@ -556,8 +536,8 @@ public class JobServiceImpl extends Service implements JobService {
     public int mergeJob(JobMergeParam mergeParam) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         int updateCount = 0;
-        OrganizationAssert.notNull(mergeParam.getTargetJob(), "请选择需要合并的岗位");
-        OrganizationAssert.notBlank(mergeParam.getMergeName(), "请输入合并后的名称");
+        OrganizationAssert.notNull(mergeParam.getTargetJob(), SystemEnv.getHtmlLabelName(547428,user.getLanguage()));
+        OrganizationAssert.notBlank(mergeParam.getMergeName(), SystemEnv.getHtmlLabelName(547270,user.getLanguage()));
 
         // 不可选择岗位本身、以及子岗位
         Set<Long> disableIds = new HashSet<>();
@@ -567,7 +547,7 @@ public class JobServiceImpl extends Service implements JobService {
         if (CollectionUtils.isNotEmpty(jobs)) {
             addDisableIds(disableIds, jobs);
         }
-        OrganizationAssert.isFalse(disableIds.contains(mergeParam.getTargetJob()), "请勿选择当前岗位本身及其子岗位");
+        OrganizationAssert.isFalse(disableIds.contains(mergeParam.getTargetJob()), SystemEnv.getHtmlLabelName(547429,user.getLanguage()));
 
         // 合并到的岗位
         JobPO targetJob = getJobMapper().getJobById(mergeParam.getTargetJob());
@@ -578,20 +558,8 @@ public class JobServiceImpl extends Service implements JobService {
         // 递归处理子岗位所属分部、所部部门、上级岗位
         recursionMergeJob(jobs, targetJob.getEcCompany(), targetJob.getEcDepartment(), targetJob.getId());
 
-        // 人员信息变动，更新分部、部门、岗位
-        // updateResourceJob(jobById, targetJob);
-
-        // 更新合并后的岗位，更新组织架构图
-        // updateEcJob(targetJob, mergeParam.getMergeName());
-
-        //  targetJob.setJobName(mergeParam.getMergeName());
         getJobMapper().updateBaseJob(targetJob);
-        // new JobTriggerRunnable(jobById.getId(), targetJob.getId()).run();
-        // 原岗位删除
-        //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobById).sync();
         getJobMapper().deleteByIds(Collections.singletonList(jobById.getId()));
-        // 更新组织架构图
-        // new JobTriggerRunnable(jobById).run();
         return updateCount;
     }
 
@@ -628,10 +596,6 @@ public class JobServiceImpl extends Service implements JobService {
             job.setEcDepartment(ecDepartment);
             job.setParentJob(parentJob);
             getJobMapper().updateBaseJob(job);
-            // 更新人员信息
-            // updateResourceJob(job);
-            // 更新组织架构图
-            // new JobTriggerRunnable(job.getId()).run();
 
             // 递归处理子级元素
             List<JobPO> jobsByPid = getJobMapper().getJobsByPid(job.getId());
@@ -769,14 +733,15 @@ public class JobServiceImpl extends Service implements JobService {
      *
      * @return
      */
-    public static String repeatDetermine(String jobNo) {
+    public String repeatDetermine(String jobNo) {
         CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.JOBTITLES.getValue());
         if (StringUtils.isNotBlank(jobNo)) {
             jobNo = CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, jobNo);
             List<JobPO> list = getJobMapper().listByNo(Util.null2String(jobNo));
-            OrganizationAssert.isEmpty(list, "编号不允许重复");
+
+            OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         } else {
-            OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
+            OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), SystemEnv.getHtmlLabelName(547430,user.getLanguage()));
             jobNo = autoCreateCompanyNo();
         }
         return jobNo;
@@ -810,19 +775,4 @@ public class JobServiceImpl extends Service implements JobService {
         }
     }
 
-    ///**
-    // * 更新EC岗位
-    // *
-    // * @param jobPO
-    // */
-    //private void updateEcJob(JobPO jobPO, String newName) {
-    //    Map<String, Object> params = new HashMap<>();
-    //    params.put("job_name", newName);
-    //    params.put("jobactivityid", JOB_ACTIVITY_ID);
-    //    params.put("work_duty", jobPO.getWorkDuty());
-    //    params.put("work_authority", jobPO.getWorkAuthority());
-    //    params.put("description", jobPO.getDescription());
-    //    params.put("job_no", jobPO.getJobNo());
-    //    new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, params, jobPO).sync();
-    //}
 }

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

@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.StringUtil;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 
@@ -71,7 +72,7 @@ public class LevelServiceImpl extends Service implements LevelService {
     public int saveLevel(LevelSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         List<LevelPO> list = getLevelMapper().listByNo(Util.null2String(param.getLevelNo()));
-        OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getLevelNo(), null), "同一等级方案下编号不能重复");
+        OrganizationAssert.isTrue(checkRepeatNo(param.getSchemeId(), param.getLevelNo(), null), SystemEnv.getHtmlLabelName(547177, user.getLanguage()));
         LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID());
         return getLevelMapper().insertIgnoreNull(levelPO);
     }
@@ -80,7 +81,7 @@ public class LevelServiceImpl extends Service implements LevelService {
     public int updateLevel(LevelSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         LevelPO levelPO = LevelDTO.convertParamToPO(param, (long) user.getUID());
-        OrganizationAssert.isTrue(checkRepeatNo(levelPO.getSchemeId(), levelPO.getLevelNo(), levelPO.getId()), "同一等级方案下编号不能重复");
+        OrganizationAssert.isTrue(checkRepeatNo(levelPO.getSchemeId(), levelPO.getLevelNo(), levelPO.getId()), SystemEnv.getHtmlLabelName(547177, user.getLanguage()));
         return getLevelMapper().updateLevel(levelPO);
     }
 
@@ -94,7 +95,7 @@ public class LevelServiceImpl extends Service implements LevelService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getLevelMapper().deleteByIds(ids);
     }
 
@@ -104,8 +105,8 @@ public class LevelServiceImpl extends Service implements LevelService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
-        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
-        SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "levelName");
+        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547124, "161", "schemeId", "schemeBrowser");
+        SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "levelName");
         conditionItems.add(browserItem);
         conditionItems.add(levelNameCondition);
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
@@ -122,12 +123,12 @@ public class LevelServiceImpl extends Service implements LevelService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         String id = Util.null2String(params.get("id"));
         String schemeId = Util.null2String(params.get("schemeId"));
-        SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "levelName");
+        SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "levelName");
         levelNameCondition.setRules("required|string");
-        SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo");
+        SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "levelNo");
         levelNoCondition.setRules("required|string");
-        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
-        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
+        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description");
+        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547124, "161", "schemeId", "schemeBrowser");
         BrowserBean browserBean = browserItem.getBrowserConditionParam();
         if (StringUtils.isNotBlank(schemeId) && !"-1".equals(schemeId) && StringUtil.isEmpty(id)) {
             browserItem.setValue(schemeId);
@@ -139,7 +140,7 @@ public class LevelServiceImpl extends Service implements LevelService {
         // 编辑状态下赋值操作
         if (!StringUtil.isEmpty(id)) {
             LevelPO levelPO = getLevelMapper().getLevelByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(levelPO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(levelPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
 
             levelNameCondition.setValue(levelPO.getLevelName());
             levelNoCondition.setValue(levelPO.getLevelNo());
@@ -165,16 +166,16 @@ public class LevelServiceImpl extends Service implements LevelService {
 
     @Override
     public Map<String, List<MenuBtn>> getTableBtn() {
-        return MenuBtn.getCommonBtnDatas();
+        return MenuBtn.getCommonBtnDatas(user.getLanguage());
     }
 
     @Override
     public Map<String, Object> getTabInfo() {
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
-        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());
-        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build());
-        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build());
+        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title(SystemEnv.getHtmlLabelName(547191, user.getLanguage())).viewCondition("-1").build());
+        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).viewCondition("0").build());
+        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title(SystemEnv.getHtmlLabelName(547192, user.getLanguage())).viewCondition("1").build());
         apiDatas.put("topTabs", topTabs);
 
         HashMap<String, Integer> countMap = new HashMap<>();
@@ -189,7 +190,7 @@ public class LevelServiceImpl extends Service implements LevelService {
     @Override
     public TreeData getTreeData() {
         ArrayList<TreeData> treeDataList = getLevelMapper().getTreeData();
-        return TreeData.builder().children(treeDataList).title("职等").key("-1").build();
+        return TreeData.builder().children(treeDataList).title(SystemEnv.getHtmlLabelName(547139, user.getLanguage())).key("-1").build();
     }
 
     /**

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

@@ -44,14 +44,14 @@ public class LogViewServiceImpl extends Service implements LogViewService {
         List<SearchConditionItem> conditionItems = new ArrayList<>();
 
         // 操作者
-        SearchConditionItem operatorId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者", "1", "operatorId", "");
+        SearchConditionItem operatorId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547160, "1", "operatorId", "");
         //操作时间
-        SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,"操作时间","operateDate");
+        SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,547159,"operateDate");
 
         // 操作者部门
-        SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "4", "departmentId", "");
+        SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547167, "4", "departmentId", "");
         // 操作者分部
-        SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "164", "companyId", "");
+        SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547168, "164", "companyId", "");
 
         conditionItems.add(operatorId);
         conditionItems.add(dateItem);

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

@@ -69,8 +69,10 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         boolean isRealTime = StringUtils.isBlank(id) || "0".equals(id);
         if (isRealTime && user.getUID() != 1 && isRealDimension) {
             DetachUtil detachUtil = new DetachUtil(user);
-            String ids = detachUtil.getJclRoleLevels();
-            sql = sql + " and id in ("+ids+")";
+            if(detachUtil.isDETACH()) {
+                String ids = detachUtil.getJclRoleLevels();
+                sql = sql + " and id in (" + ids + ")";
+            }
         }
 
         rs.executeQuery(sql);
@@ -98,14 +100,20 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         // 是否展示当前数据
         boolean isSearchCurrent = StringUtils.isBlank(id) || "0".equals(id);
         String sql;
+        String judgeTreeLeafSql;
         if (isSearchCurrent) {
             sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompany where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = ? ";
             boolean isRealDimension = StringUtils.isBlank(fclass) || "0".equals(fclass);
             boolean isRealTime = StringUtils.isBlank(id) || "0".equals(id);
+            judgeTreeLeafSql = sql;
             if (isRealTime && user.getUID() != 1 && isRealDimension) {
                 DetachUtil detachUtil = new DetachUtil(user);
-                String ids = detachUtil.getJclRoleLevels();
-                sql = sql + " and id in ("+ids+")";
+                if (detachUtil.isDETACH()) {
+                    String ids = detachUtil.getJclRoleLevels();
+                    if ("0".equals(subcompany)) {
+                        sql = sql + " and id in (" + ids + ")";
+                    }
+                }
             }
             if (StringUtils.isNotBlank(fclass) && !"0".equals(fclass)) {
                 sql = "select id as id, id as value, subcompanyname as title, supsubcomid as pId from hrmsubcompanyvirtual where (canceled is null or canceled != '1') and " + DBType.get(new RecordSet().getDBType()).ifNull("supsubcomid", "0") + " = ? and companyid = '" + fclass + "'";
@@ -117,10 +125,11 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             }
             // 添加时间轴条件
             sql += " and versionid = " + id;
+            judgeTreeLeafSql = sql;
         }
-        rs.executeQuery(sql,subcompany);
+        rs.executeQuery(sql, subcompany);
         while (rs.next()) {
-            companyTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(sql, rs.getString("id"))).build());
+            companyTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(judgeTreeLeafSql, rs.getString("id"))).build());
         }
         result.put("companyTree", companyTree);
         return result;
@@ -617,25 +626,25 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         RecordSet rs = new RecordSet();
         String recordDate = OrganizationDateUtil.getFormatLocalDateTime(LocalDateTime.now());
         String createDate = OrganizationDateUtil.getFormatLocalDate(LocalDate.now());
-        rs.executeQuery("select id from JCL_ORG_CHARTVERSION where fclass = ? and createtime = ?",fclass,createDate);
+        rs.executeQuery("select id from JCL_ORG_CHARTVERSION where fclass = ? and createtime = ?", fclass, createDate);
         rs.next();
         String id = Util.null2String(rs.getString("id"));
-        if(StringUtils.isNotEmpty(id)){
-            rs.executeUpdate("update JCL_ORG_CHARTVERSION set recorddate = ?,description = ?,creator = ? where fclass = ? and createtime = ?",recordDate,description,user.getUID(),fclass,createDate);
-        }else {
-            rs.executeUpdate("insert into JCL_ORG_CHARTVERSION (recorddate,description,creator,deletetype,createtime,fclass) values(?,?,?,?,?,?)",recordDate,description,user.getUID(),0,createDate,fclass);
+        if (StringUtils.isNotEmpty(id)) {
+            rs.executeUpdate("update JCL_ORG_CHARTVERSION set recorddate = ?,description = ?,creator = ? where fclass = ? and createtime = ?", recordDate, description, user.getUID(), fclass, createDate);
+        } else {
+            rs.executeUpdate("insert into JCL_ORG_CHARTVERSION (recorddate,description,creator,deletetype,createtime,fclass) values(?,?,?,?,?,?)", recordDate, description, user.getUID(), 0, createDate, fclass);
         }
 
     }
 
     @Override
     public Map<String, Object> searchTimeLines(Map<String, Object> params) {
-        Map<String,Object> datas = new HashMap<>();
+        Map<String, Object> datas = new HashMap<>();
         RecordSet rs = new RecordSet();
         String fclass = Util.null2String(params.get("fclass"));
         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);
+        rs.executeQuery("SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ? order by id desc", fclass, 0);
         while (rs.next()) {
             timeLinesBOList.add(TimeLinesBO.builder()
                     .key(rs.getInt("id"))
@@ -646,7 +655,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
                     .build());
         }
 
-        datas.put("timelineList",timeLinesBOList);
+        datas.put("timelineList", timeLinesBOList);
         return datas;
     }
 

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

@@ -33,14 +33,17 @@ import com.engine.organization.util.tree.SearchTreeUtil;
 import com.engine.organization.util.word.CustomXWPFDocument;
 import com.engine.organization.util.word.WordUtil;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.Document;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFPictureData;
 import org.apache.xmlbeans.XmlOptions;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBody;
+import weaver.conn.RecordSet;
 import weaver.general.GCONST;
 import weaver.general.StringUtil;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -126,14 +129,14 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_AllExport").build());
 
         resultMap.put("topMenu", topMenuList);
         // 新增
         rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build());
         rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build());
         rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build());
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName("全部导出").type("BTN_AllExport").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_AllExport").build());
 
         resultMap.put("rightMenu", rightMenuList);
         return resultMap;
@@ -587,7 +590,10 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
 
         // 补充人员所有岗位,关联人员及聚才林岗位
         for (ResourcePO resource : resourcePOS) {
-            JobPO jobByResource = getJobMapper().getJobByResource(resource);
+            if (null == resource) {
+                continue;
+            }
+            JobPO jobByResource = getJobByResource(resource);
             if (null != jobByResource) {
                 resource.setJobId(jobByResource.getId());
                 builderJobs.add(jobByResource);
@@ -676,7 +682,10 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
 
         // 补充人员所有岗位,关联人员及聚才林岗位
         for (ResourcePO resource : resourcePOS) {
-            JobPO jobByResource = getJobMapper().getJobByResource(resource);
+            if (null == resource) {
+                continue;
+            }
+            JobPO jobByResource = getJobByResource(resource);
             if (null != jobByResource) {
                 resource.setJobId(jobByResource.getId());
                 builderJobs.add(jobByResource);
@@ -760,4 +769,87 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
             buildParentComps(parentComp, builderComps, allMaps);
         }
     }
+
+    private JobPO getJobByResource(ResourcePO resourcePO) {
+        RecordSet rs = new RecordSet();
+        String sql = "select\n" +
+                "        t.id,\n" +
+                "        t.job_no,\n" +
+                "        h.jobtitlename,\n" +
+                "        t.ec_jobTitle,\n" +
+                "        t.ec_company,\n" +
+                "        t.ec_department,\n" +
+                "        t.sequence_id,\n" +
+                "        t.scheme_id,\n" +
+                "        t.parent_job,\n" +
+                "        t.is_key,\n" +
+                "        t.workplace,\n" +
+                "        t.description,\n" +
+                "        t.work_duty,\n" +
+                "        t.work_authority,\n" +
+                "        t.show_order,\n" +
+                "        t.forbidden_tag,\n" +
+                "        t.grade_id,\n" +
+                "        t.level_id\n" +
+                "        from jcl_org_job t\n" +
+                "        left join hrmjobtitles h on t.ec_jobTitle = h.id\n" +
+                "        where t.delete_type = 0 ";
+        if (null != resourcePO.getSubcompanyid1()) {
+            sql += " and t.ec_company = '" + resourcePO.getSubcompanyid1() + "'";
+        }
+        if (null == resourcePO.getSubcompanyid1()) {
+            sql += " and t.ec_company is null";
+        }
+        if (null != resourcePO.getDepartmentid()) {
+            sql += " and t.ec_department = '" + resourcePO.getDepartmentid() + "'";
+        }
+        if (null != resourcePO.getDepartmentid()) {
+            sql += " and t.ec_department is null";
+        }
+        if (null != resourcePO.getJobtitle()) {
+            sql += " and t.ec_jobTitle = '" + resourcePO.getJobtitle() + "'";
+        }
+        rs.executeQuery(sql);
+        if (rs.next()) {
+            String id = rs.getString("id");
+            String job_no = rs.getString("job_no");
+            String jobtitlename = rs.getString("jobtitlename");
+            String ec_jobTitle = rs.getString("ec_jobTitle");
+            String ec_company = rs.getString("ec_company");
+            String ec_department = rs.getString("ec_department");
+            String sequence_id = rs.getString("sequence_id");
+            String scheme_id = rs.getString("scheme_id");
+            String parent_job = rs.getString("parent_job");
+            String is_key = rs.getString("is_key");
+            String workplace = rs.getString("workplace");
+            String description = rs.getString("description");
+            String work_duty = rs.getString("work_duty");
+            String work_authority = rs.getString("work_authority");
+            String show_order = rs.getString("show_order");
+            String forbidden_tag = rs.getString("forbidden_tag");
+            String grade_id = rs.getString("grade_id");
+            String level_id = rs.getString("level_id");
+            JobPO jobPO = new JobPO();
+            jobPO.setId(StringUtils.isBlank(id) ? null : Long.parseLong(id));
+            jobPO.setJobNo(job_no);
+            jobPO.setJobTitleName(jobtitlename);
+            jobPO.setEcJobTitle(StringUtils.isBlank(ec_jobTitle) ? null : Integer.parseInt(ec_jobTitle));
+            jobPO.setEcCompany(StringUtils.isBlank(ec_company) ? null : Integer.parseInt(ec_company));
+            jobPO.setEcDepartment(StringUtils.isBlank(ec_department) ? null : Integer.parseInt(ec_department));
+            jobPO.setSequenceId(StringUtils.isBlank(sequence_id) ? null : Long.parseLong(sequence_id));
+            jobPO.setSchemeId(StringUtils.isBlank(scheme_id) ? null : Long.parseLong(scheme_id));
+            jobPO.setParentJob(StringUtils.isBlank(parent_job) ? null : Long.parseLong(parent_job));
+            jobPO.setIsKey(StringUtils.isBlank(is_key) ? null : Integer.parseInt(is_key));
+            jobPO.setWorkplace(workplace);
+            jobPO.setDescription(description);
+            jobPO.setWorkDuty(work_duty);
+            jobPO.setWorkAuthority(work_authority);
+            jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Integer.parseInt(show_order));
+            jobPO.setForbiddenTag(StringUtils.isBlank(forbidden_tag) ? null : Integer.parseInt(forbidden_tag));
+            jobPO.setGradeId(grade_id);
+            jobPO.setLevelId(level_id);
+            return jobPO;
+        }
+        return null;
+    }
 }

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

@@ -24,6 +24,7 @@ import weaver.conn.RecordSet;
 import weaver.general.BaseBean;
 import weaver.general.GCONST;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -107,7 +108,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
     public int savePostInfo(PostInfoSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         List<PostInfoPO> list = getPostInfoMapper().listByNo(Util.null2String(param.getPostInfoNo()));
-        OrganizationAssert.isEmpty(list, "编号不允许重复");
+        OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         PostInfoPO postInfoPO = PostInfoDTO.convertParamToPO(param, (long) user.getUID());
         return getPostInfoMapper().insertIgnoreNull(postInfoPO);
     }
@@ -119,7 +120,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         String oldPostInfoNo = getPostInfoMapper().getPostInfoByID(postInfoPO.getId()).getPostInfoNo();
         if (!oldPostInfoNo.equals(postInfoPO.getPostInfoNo())) {
             List<PostInfoPO> list = getPostInfoMapper().listByNo(Util.null2String(postInfoPO.getPostInfoNo()));
-            OrganizationAssert.isEmpty(list, "编号不允许重复");
+            OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         }
         return getPostInfoMapper().updatePostInfo(postInfoPO);
     }
@@ -135,7 +136,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getPostInfoMapper().deleteByIds(ids);
     }
 
@@ -146,7 +147,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
         SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "职务分类", "161", "postId", "postBrowser");
-        SearchConditionItem nameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "postInfoName");
+        SearchConditionItem nameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "postInfoName");
         conditionItems.add(browserItem);
         conditionItems.add(nameCondition);
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
@@ -162,10 +163,10 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         // 编号
-        SearchConditionItem noItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "postInfoNo");
+        SearchConditionItem noItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "postInfoNo");
         noItem.setRules("required|string");
         // 名称
-        SearchConditionItem nameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postInfoName");
+        SearchConditionItem nameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "postInfoName");
         nameItem.setRules("required|string");
         // 权限
         SearchConditionItem authorityItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 0, "权限", "postInfoAuthority");
@@ -177,14 +178,14 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         SearchConditionItem postIdBrowser = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职务分类", "161", "postId", "postBrowser");
         postIdBrowser.setRules("required|string");
         // 说明
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));
         String planId = Util.null2String(params.get("planId"));
         if (StringUtils.isNotBlank(id)) {
             PostInfoPO postInfoPO = getPostInfoMapper().getPostInfoByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(postInfoPO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(postInfoPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
 
             noItem.setValue(postInfoPO.getPostInfoNo());
             nameItem.setValue(postInfoPO.getPostInfoName());
@@ -224,23 +225,24 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         Map<String, Object> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
+        int userLanguage = user.getLanguage();
         // 新增
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addPlan").menuIcon("icon-coms-New-Flow").menuName("新增职务分类").type("BTN_AddPlan").build());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editPlan").menuIcon("icon-coms-edit").menuName("修改职务分类").type("BTN_EditPlan").build());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delPlan").menuIcon("icon-coms-Delete").menuName("删除职务分类").type("BTN_DelPlan").build());
-        topMenuList.add(MenuBtn.topMenu_addNew());
+        topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
         // 批量删除
-        topMenuList.add(MenuBtn.topMenu_batchDelete());
-        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
+        topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
+        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
 
         btnDatas.put("topMenu", topMenuList);
         // 新增
-        rightMenuList.add(MenuBtn.rightMenu_addNew());
-        rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
+        rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
+        rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
         // 日志
-        rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
         // 显示列定制
-        rightMenuList.add(MenuBtn.rightMenu_btnColumn());
+        rightMenuList.add(MenuBtn.rightMenu_btnColumn(userLanguage));
 
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;

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

@@ -14,6 +14,7 @@ import com.engine.organization.util.OrganizationFormItemUtil;
 import com.engine.organization.util.db.MapperProxyFactory;
 import weaver.general.StringUtil;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 
@@ -48,7 +49,7 @@ public class PostServiceImpl extends Service implements PostService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getPostMapper().deleteByIds(ids);
     }
 
@@ -58,15 +59,15 @@ public class PostServiceImpl extends Service implements PostService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "postName");
+        SearchConditionItem postNameItem = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "postName");
         postNameItem.setRules("required|string");
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {
             PostPO postPO = getPostMapper().getPostByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(postPO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(postPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
 
             postNameItem.setValue(postPO.getPostName());
             descriptionItem.setValue(postPO.getDescription());

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

@@ -71,7 +71,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
                     } else {
                         // 字段本身值、判断有无下拉框选项
                         List<ConditionOption> options = selectOptions.stream().map(item -> ConditionOption.builder().key(item.getKey()).showname(item.getShowname()).build()).collect(Collectors.toList());
-                        options.add(0,ConditionOption.builder().key("-1").showname("全部").build());
+                        options.add(0,ConditionOption.builder().key("-1").showname(SystemEnv.getHtmlLabelName(547191,user.getLanguage())).build());
                         condition.setOptions(options);
                     }
                     rangeConditions.add(condition);
@@ -105,7 +105,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
                         condition.setCom("未设置选项");
                     } else {
                         List<ConditionOption> collect = quickSearchDetailList.stream().map(item -> ConditionOption.builder().key(item.getId().toString()).showname(item.getCustomName()).build()).collect(Collectors.toList());
-                        collect.add(0,ConditionOption.builder().key("-1").showname("全部").build());
+                        collect.add(0,ConditionOption.builder().key("-1").showname(SystemEnv.getHtmlLabelName(547191,user.getLanguage())).build());
                         condition.setOptions(collect);
                     }
                     rangeConditions.add(condition);

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

@@ -23,6 +23,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -95,9 +96,9 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
             resourceTypeItem.setBrowserConditionParam(browserBean);
         }
 
-        SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "fno");
+        SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "fno");
         fNo.setRules("required|string");
-        SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "fname");
+        SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "fname");
         fName.setRules("required|string");
         SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo");
 
@@ -125,7 +126,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
 
     @Override
     public int deletByIds(Collection<Long> ids) {
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getResourceBasicInfoMapper().deleteByIds(ids);
     }
 
@@ -138,7 +139,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
     @Override
     public int save(ResourceItemPO resourceItemPO) {
         List<ResourceItemPO> list = getResourceBasicInfoMapper().selectItemByFNo(resourceItemPO.getFno(), resourceItemPO.getFclassid());
-        OrganizationAssert.isEmpty(list, "编号不允许重复");
+        OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, this.user.getLanguage()));
         return getResourceBasicInfoMapper().insertIgnoreNull(resourceItemPO);
     }
 
@@ -157,9 +158,9 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
         String id = Util.null2String(params.get("fid"));
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "fno");
+        SearchConditionItem fNo = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "fno");
         fNo.setRules("required|string");
-        SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "fname");
+        SearchConditionItem fName = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "fname");
         fName.setRules("required|string");
         SearchConditionItem fMemo = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "说明", "fmemo");
 
@@ -181,7 +182,7 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
     @Override
     public int saveResourceItemClass(ResourceItemClassPO itemClassPO) {
         List<ResourceItemClassPO> list = getResourceBasicInfoMapper().selectItemClassByFNo(itemClassPO.getFno(), null);
-        OrganizationAssert.isEmpty(list, "编号不允许重复");
+        OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         itemClassPO.setCreator((long) user.getUID());
         itemClassPO.setCreateTime(new Date());
         return getResourceBasicInfoMapper().saveResourceItemClass(itemClassPO);
@@ -211,8 +212,8 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
     public List<SearchConditionGroup> getSearchCondition() {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
-        SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "fname");
-        SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "fno");
+        SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "fname");
+        SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "fno");
         conditionItems.add(schemeNameCondition);
         conditionItems.add(schemeNoCondition);
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));

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

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.StringUtil;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -65,7 +66,9 @@ public class SchemeServiceImpl extends Service implements SchemeService {
     public int save(SchemeSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         List<SchemePO> list = getSchemeMapper().listByNo(Util.null2String(param.getSchemeNo()));
-        OrganizationAssert.isEmpty(list, "编号不允许重复");
+        OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
+        List<SchemePO> schemePOS = getSchemeMapper().selectByParams(param.getSubcompanyid(), param.getSchemeName());
+        OrganizationAssert.isEmpty(schemePOS, SystemEnv.getHtmlLabelName(547153,user.getLanguage()));
         SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID());
         return getSchemeMapper().insertIgnoreNull(schemePO);
     }
@@ -78,7 +81,9 @@ public class SchemeServiceImpl extends Service implements SchemeService {
         String oldSchemeNo = getSchemeMapper().getSchemeByID(schemePO.getId()).getSchemeNo();
         if (!oldSchemeNo.equals(schemePO.getSchemeNo())) {
             List<SchemePO> list = getSchemeMapper().listByNo(Util.null2String(schemePO.getSchemeNo()));
-            OrganizationAssert.isEmpty(list, "编号不允许重复");
+            OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
+            List<SchemePO> schemePOS = getSchemeMapper().selectByParams(param.getSubcompanyid(), param.getSchemeName());
+            OrganizationAssert.isEmpty(schemePOS, SystemEnv.getHtmlLabelName(547153,user.getLanguage()));
         }
         return getSchemeMapper().updateScheme(schemePO);
     }
@@ -94,7 +99,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getSchemeMapper().deleteByIds(ids);
     }
 
@@ -104,8 +109,8 @@ public class SchemeServiceImpl extends Service implements SchemeService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
-        SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "方案名称", "schemeName");
-        SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "方案编号", "schemeNo");
+        SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547127, "schemeName");
+        SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547131, "schemeNo");
         conditionItems.add(schemeNameCondition);
         conditionItems.add(schemeNoCondition);
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
@@ -120,18 +125,18 @@ public class SchemeServiceImpl extends Service implements SchemeService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案名称", "schemeName");
+        SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547127, "schemeName");
         schemeNameCondition.setRules("required|string");
-        SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案编号", "schemeNo");
+        SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547131, "schemeNo");
         schemeNoCondition.setRules("required|string");
-        SearchConditionItem subCompanyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 2, false, "所属分部", "164", "subCompanyId", "");
-        SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "方案说明", "schemeDescription");
+        SearchConditionItem subCompanyIdItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547128, "164", "subCompanyId", "");
+        SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547129, "schemeDescription");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {
             SchemePO schemePO = getSchemeMapper().getSchemeByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(schemePO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(schemePO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
             schemeNameCondition.setValue(schemePO.getSchemeName());
             schemeNoCondition.setValue(schemePO.getSchemeNo());
             textareaItem.setValue(schemePO.getSchemeDescription());
@@ -152,7 +157,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
 
     @Override
     public Map<String, List<MenuBtn>> getTableBtn() {
-        return MenuBtn.getCommonBtnDatas();
+        return MenuBtn.getCommonBtnDatas(user.getLanguage());
     }
 
     @Override
@@ -164,8 +169,8 @@ public class SchemeServiceImpl extends Service implements SchemeService {
             List<String> asList = Arrays.asList(jclRoleLevels.split(","));
             treeDataList = treeDataList.stream().filter(item->asList.contains(item.getSubCompanyId())).collect(Collectors.toList());
         }
-        List<TypeTreeVO> childList = treeDataList.stream().map(e -> TypeTreeVO.builder().domid(e.getKey()).key(Long.parseLong(e.getKey())).name(e.getStatus() == 0 ? e.getTitle() : e.getTitle() + "(已禁用)").build()).collect(Collectors.toList());
-        TypeTreeVO build = TypeTreeVO.builder().childs(childList).haschild(true).domid("-1").key(-1L).name("全部方案").build();
+        List<TypeTreeVO> childList = treeDataList.stream().map(e -> TypeTreeVO.builder().domid(e.getKey()).key(Long.parseLong(e.getKey())).name(e.getStatus() == 0 ? e.getTitle() : e.getTitle() + "("+SystemEnv.getHtmlLabelName(547155,user.getLanguage())+")").build()).collect(Collectors.toList());
+        TypeTreeVO build = TypeTreeVO.builder().childs(childList).haschild(true).domid("-1").key(-1L).name(SystemEnv.getHtmlLabelName(547140,user.getLanguage())).build();
         List<TypeTreeVO> typeTreeVOS = new ArrayList<>();
         typeTreeVOS.add(build);
         return typeTreeVOS;

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

@@ -19,11 +19,19 @@ import com.engine.organization.util.*;
 import com.engine.organization.util.db.DBType;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.detach.DetachUtil;
+import com.engine.organization.util.excel.ExcelUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
+import weaver.general.GCONST;
 import weaver.general.StringUtil;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.*;
 
 
@@ -35,6 +43,40 @@ import java.util.*;
  */
 public class SequenceServiceImpl extends Service implements SequenceService {
 
+    // 判断岗位序列导入模板是否存在，不存在则创建该文件
+    static {
+        try {
+            String outPutPath = GCONST.getRootPath() + File.separator + "hrm" + File.separator + "import" + File.separator + "template" + File.separator + "sequence.xls";
+            File excelPathFile = new File(outPutPath);
+            if (!excelPathFile.exists()) {
+                String columns = "编号,名称,等级方案,方案所属分部,描述说明";
+                String[] split = columns.split(",");
+                List<Object> columnList = new ArrayList<>(Arrays.asList(split));
+                // 创建导入模板
+                List<List<Object>> excelSheetData = new ArrayList<>();
+                excelSheetData.add(columnList);
+                XSSFWorkbook sheets = ExcelUtil.genWorkbookV2(excelSheetData, "sequence");
+                File excelFile = new File(outPutPath);
+                if (!excelFile.exists()) {
+                    String substring = outPutPath.substring(0, outPutPath.lastIndexOf(File.separator));
+                    File file = new File(substring);
+                    if (file.mkdirs()) {
+                        boolean newFile = excelPathFile.createNewFile();
+                        if (!newFile) {
+                            throw new IOException(outPutPath + ",File Creation Failed");
+                        }
+                    }
+                }
+                FileOutputStream out = new FileOutputStream(excelPathFile);
+                sheets.write(out);
+                out.flush();
+            }
+        } catch (IOException e) {
+            new BaseBean().writeLog(e);
+            throw new RuntimeException(e);
+        }
+    }
+
     private static final String RIGHT_NAME = "Sequence:All";
 
     private SequenceMapper getSequenceMapper() {
@@ -70,7 +112,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
     public int saveSequence(SequenceSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         List<SequencePO> list = getSequenceMapper().listByNo(Util.null2String(param.getSequenceNo()));
-        OrganizationAssert.isEmpty(list, "编号不允许重复");
+        OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         SequencePO sequencePO = SequenceDTO.convertParamToPO(param, (long) user.getUID());
         return getSequenceMapper().insertIgnoreNull(sequencePO);
     }
@@ -82,7 +124,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
         String oldSequenceNo = getSequenceMapper().getSequenceByID(sequencePO.getId()).getSequenceNo();
         if (!oldSequenceNo.equals(sequencePO.getSequenceNo())) {
             List<SequencePO> list = getSequenceMapper().listByNo(Util.null2String(sequencePO.getSequenceNo()));
-            OrganizationAssert.isEmpty(list, "编号不允许重复");
+            OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         }
         return getSequenceMapper().updateSequence(sequencePO);
     }
@@ -97,7 +139,7 @@ public class SequenceServiceImpl extends Service implements SequenceService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getSequenceMapper().deleteByIds(ids);
     }
 
@@ -107,8 +149,8 @@ public class SequenceServiceImpl extends Service implements SequenceService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
-        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
-        SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "sequenceName");
+        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547124, "161", "schemeId", "schemeBrowser");
+        SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "sequenceName");
         conditionItems.add(browserItem);
         conditionItems.add(sequenceNameCondition);
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
@@ -123,19 +165,19 @@ public class SequenceServiceImpl extends Service implements SequenceService {
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "sequenceName");
+        SearchConditionItem sequenceNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547141, "sequenceName");
         sequenceNameCondition.setRules("required|string");
-        SearchConditionItem sequenceNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "sequenceNo");
+        SearchConditionItem sequenceNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, 547118, "sequenceNo");
         sequenceNoCondition.setRules("required|string");
-        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, "描述说明", "description");
-        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
+        SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 200, 547142, "description");
+        SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, 547124, "161", "schemeId", "schemeBrowser");
         browserItem.setRules("required|string");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {
             SequencePO sequencePO = getSequenceMapper().getSequenceByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(sequencePO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(sequencePO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
 
             sequenceNameCondition.setValue(sequencePO.getSequenceName());
             sequenceNoCondition.setValue(sequencePO.getSequenceNo());
@@ -162,16 +204,19 @@ public class SequenceServiceImpl extends Service implements SequenceService {
 
     @Override
     public Map<String, List<MenuBtn>> getHasRight() {
-        return MenuBtn.getCommonBtnDatas();
+        Map<String, List<MenuBtn>> commonBtnDatas = MenuBtn.getCommonBtnDatas(user.getLanguage());
+        commonBtnDatas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
+        commonBtnDatas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("importFile").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
+        return commonBtnDatas;
     }
 
     @Override
     public Map<String, Object> getTabInfo() {
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
-        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());
-        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build());
-        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build());
+        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title(SystemEnv.getHtmlLabelName(547191,user.getLanguage())).viewCondition("-1").build());
+        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title(SystemEnv.getHtmlLabelName(547186,user.getLanguage())).viewCondition("0").build());
+        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title(SystemEnv.getHtmlLabelName(547192, user.getLanguage())).viewCondition("1").build());
         apiDatas.put("topTabs", topTabs);
 
         HashMap<String, Integer> countMap = new HashMap<>();

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

@@ -22,6 +22,7 @@ import weaver.common.DateUtil;
 import weaver.conn.RecordSet;
 import weaver.general.StringUtil;
 import weaver.general.Util;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 
@@ -64,7 +65,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
     public int saveStaffPlan(StaffPlanSearchParam param) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         List<StaffPlanPO> list = getStaffPlanMapper().listByNo(Util.null2String(param.getPlanNo()));
-        OrganizationAssert.isEmpty(list, "编号不允许重复");
+        OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         // 结束时间大于开始时间
         StaffPlanPO staffPlanPO = StaffPlanBO.convertParamToPO(param, (long) user.getUID());
         // 多选赋值
@@ -87,7 +88,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         String oldPlanNo = getStaffPlanMapper().getStaffPlanByID(staffPlanPO.getId()).getPlanNo();
         if (!oldPlanNo.equals(staffPlanPO.getPlanNo())) {
             List<StaffPlanPO> list = getStaffPlanMapper().listByNo(Util.null2String(staffPlanPO.getPlanNo()));
-            OrganizationAssert.isEmpty(list, "编号不允许重复");
+            OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         }
         // 结束时间大于开始时间
         String timeStart = param.getTimeStart();
@@ -114,7 +115,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         return getStaffPlanMapper().deleteByIds(ids);
     }
 
@@ -124,9 +125,9 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> conditionItems = new ArrayList<>();
         // 编号
-        SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "planNo");
+        SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547118, "planNo");
         // 名称
-        SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "planName");
+        SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "planName");
         // 年度
         SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "年度", "planYear");
         planYearItem.setFormat("YYYY");
@@ -140,8 +141,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description");
         // 状态
         List<SearchConditionOption> selectOptions = new ArrayList<>();
-        SearchConditionOption enableOption = new SearchConditionOption("true", "启用");
-        SearchConditionOption disableOption = new SearchConditionOption("false", "禁用");
+        SearchConditionOption enableOption = new SearchConditionOption("true", SystemEnv.getHtmlLabelName(547186, user.getLanguage()));
+        SearchConditionOption disableOption = new SearchConditionOption("false", SystemEnv.getHtmlLabelName(547192, user.getLanguage()));
         selectOptions.add(enableOption);
         selectOptions.add(disableOption);
         SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "禁用标记", "forbiddenTag");
@@ -167,10 +168,10 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         // 编号
-        SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "编号", "planNo");
+        SearchConditionItem planNoItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547118, "planNo");
         planNoItem.setRules("required|string");
         // 名称
-        SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "planName");
+        SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547141, "planName");
         planNameItem.setRules("required|string");
         // 年度
         SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "年度", "planYear");
@@ -203,7 +204,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {
             StaffPlanPO staffPlanPO = getStaffPlanMapper().getStaffPlanByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(staffPlanPO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(staffPlanPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
             planNoItem.setValue(staffPlanPO.getPlanNo());
             planNameItem.setValue(staffPlanPO.getPlanName());
             planYearItem.setValue(Util.null2String(staffPlanPO.getPlanYear()));
@@ -237,7 +238,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
 
     @Override
     public Map<String, List<MenuBtn>> getHasRight() {
-        return MenuBtn.getCommonBtnDatas();
+        return MenuBtn.getCommonBtnDatas(user.getLanguage());
     }
 
 

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

@@ -31,7 +31,6 @@ import com.engine.organization.util.browser.OrganizationBrowserUtil;
 import com.engine.organization.util.db.DBType;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.excel.ExcelUtil;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import weaver.conn.RecordSet;
@@ -41,6 +40,7 @@ import weaver.general.StringUtil;
 import weaver.general.Util;
 import weaver.hrm.company.DepartmentComInfo;
 import weaver.hrm.company.SubCompanyComInfo;
+import weaver.systeminfo.SystemEnv;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -188,7 +188,7 @@ public class StaffServiceImpl extends Service implements StaffService {
     @Override
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notEmpty(ids, "请选择要删除的数据");
+        OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
         List<StaffPO> staffsByIds = getStaffMapper().getStaffsByIds(ids);
         int deleteByIds = getStaffMapper().deleteByIds(ids);
         //for (StaffPO staffsById : staffsByIds) {
@@ -286,14 +286,14 @@ public class StaffServiceImpl extends Service implements StaffService {
         controlPolicyItem.setViewAttr(3);
         controlPolicyItem.setValue("1");
         controlPolicyItem.setRules("required|string");
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, "描述说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, 547142, "description");
 
         StaffPlanPO staffPlanPO = new StaffPlanPO();
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));
         if (!StringUtil.isEmpty(id)) {
             StaffPO staffPO = getStaffMapper().getStaffByID(Integer.parseInt(id));
-            OrganizationAssert.notNull(staffPO, "选择的数据不存在，或数据已删除");
+            OrganizationAssert.notNull(staffPO, SystemEnv.getHtmlLabelName(547154,user.getLanguage()));
              staffPlanPO = getStaffPlanMapper().getStaffPlanByID(staffPO.getPlanId());
 
             BrowserBean planIdItemBean = planIdItem.getBrowserConditionParam();
@@ -356,9 +356,9 @@ public class StaffServiceImpl extends Service implements StaffService {
 
     @Override
     public Map<String, Object> getHasRight() {
-        Map<String, List<MenuBtn>> datas = MenuBtn.getCommonBtnDatas();
-        datas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
-        datas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
+        Map<String, List<MenuBtn>> datas = MenuBtn.getCommonBtnDatas(user.getLanguage());
+        datas.get("topMenu").add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
+        datas.get("rightMenu").add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName(SystemEnv.getHtmlLabelName(547242,user.getLanguage())).type("BTN_BatchImport").build());
         Map<String, Object> map = new HashMap<>(datas);
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();

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

@@ -0,0 +1,52 @@
+package com.engine.organization.util;
+
+import com.engine.organization.entity.hrmresource.param.HrmStatusHistoryParam;
+import com.engine.organization.entity.hrmresource.po.ResourceChartPO;
+import weaver.conn.RecordSet;
+import weaver.hrm.company.DepartmentComInfo;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/5/29 2:50 PM
+ * @Description: 人员工作记录
+ * @Version 1.0
+ */
+public class HrmStatusHistoryUtil {
+
+    /**
+     * @param resourceChartPOList 调整前人员信息
+     * @param departmentID 调整后部门
+     */
+    public static void personWorkRecord(List<ResourceChartPO> resourceChartPOList,Integer departmentID,String changeReason){
+
+        RecordSet rs = new RecordSet();
+
+        DepartmentComInfo comInfo = new DepartmentComInfo();
+        String subcompanyid1 = comInfo.getSubcompanyid1(String.valueOf(departmentID));
+        Integer newSub = "".equals(subcompanyid1) ? null : Integer.valueOf(subcompanyid1);
+
+        List<HrmStatusHistoryParam> historyParamList = new ArrayList<>();
+        resourceChartPOList.forEach(item -> historyParamList.add(HrmStatusHistoryParam.builder()
+                .resourceId(item.getId())
+                .changeDate(OrganizationDateUtil.getFormatLocalDate(LocalDate.now()))
+                .changeReason(changeReason)
+                .oldJobtitleId(item.getJobTitle())
+                .newjobtitleId(item.getJobTitle())
+                .typeN(4)
+                .oldDepartmentId(item.getDepartmentId())
+                .newDepartmentId(departmentID)
+                .oldSubcompanyId(item.getSubcompanyid1())
+                .newSubcompanyId(newSub)
+        .build()));
+
+        historyParamList.forEach(item -> {
+            rs.executeUpdate("insert into hrmstatushistory(resourceid,changedate,changereason,oldjobtitleid,newjobtitleid,type_n,olddepartmentid,newdepartmentid,oldsubcompanyid,newsubcompanyid) " +
+                    " values(?,?,?,?,?,?,?,?,?,?)",item.getResourceId(),item.getChangeDate(),item.getChangeReason(),item.getOldJobtitleId(),item.getNewjobtitleId(),item.getTypeN(),
+                    item.getOldDepartmentId(),item.getNewDepartmentId(),item.getOldSubcompanyId(),item.getNewSubcompanyId());
+        });
+    }
+}

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

@@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,8 +34,8 @@ public class MenuBtn {
      *
      * @return
      */
-    public static MenuBtn topMenu_addNew() {
-        return MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
+    public static MenuBtn topMenu_addNew(int userLanguage) {
+        return MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName(SystemEnv.getHtmlLabelName(547123,userLanguage)).type("BTN_Addnew").build();
     }
 
     /**
@@ -42,8 +43,8 @@ public class MenuBtn {
      *
      * @return
      */
-    public static MenuBtn topMenu_batchDelete() {
-        return MenuBtn.builder().isBatch("1").isTop("1").menuFun("batchDelete").menuIcon("icon-coms-Batch-delete").menuName("批量删除").type( "BTN_BatchDelete").build();
+    public static MenuBtn topMenu_batchDelete(int userLanguage) {
+        return MenuBtn.builder().isBatch("1").isTop("1").menuFun("batchDelete").menuIcon("icon-coms-Batch-delete").menuName(SystemEnv.getHtmlLabelName(547125,userLanguage)).type( "BTN_BatchDelete").build();
     }
 
     /**
@@ -51,7 +52,7 @@ public class MenuBtn {
      *
      * @return
      */
-    public static MenuBtn topMenu_copy() {
+    public static MenuBtn topMenu_copy(int userLanguage) {
         return MenuBtn.builder().isBatch("1").isTop("1").menuFun("copy").menuIcon("icon-coms-form-copy").menuName("批量复制").type( "BTN_Copy").build();
     }
 
@@ -60,8 +61,8 @@ public class MenuBtn {
      *
      * @return
      */
-    public static MenuBtn rightMenu_addNew() {
-        return MenuBtn.builder().isBatch("0").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新增").type("BTN_Addnew").build();
+    public static MenuBtn rightMenu_addNew(int userLanguage) {
+        return MenuBtn.builder().isBatch("0").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName(SystemEnv.getHtmlLabelName(547123,userLanguage)).type("BTN_Addnew").build();
     }
 
     /**
@@ -69,8 +70,8 @@ public class MenuBtn {
      *
      * @return
      */
-    public static MenuBtn rightMenu_btnLog() {
-        return MenuBtn.builder().isBatch("0").isTop("0").menuFun("log").menuIcon("icon-coms-Print-log").menuName("日志").type("BTN_log").build();
+    public static MenuBtn rightMenu_btnLog(int userLanguage) {
+        return MenuBtn.builder().isBatch("0").isTop("0").menuFun("log").menuIcon("icon-coms-Print-log").menuName(SystemEnv.getHtmlLabelName(547126,userLanguage)).type("BTN_log").build();
     }
 
     /**
@@ -78,7 +79,7 @@ public class MenuBtn {
      *
      * @return
      */
-    public static MenuBtn rightMenu_copy() {
+    public static MenuBtn rightMenu_copy(int userLanguage) {
         return MenuBtn.builder().isBatch("0").isTop("0").menuFun("copy").menuIcon("icon-coms-form-copy").menuName("复制").type( "BTN_Copy").build();
     }
 
@@ -87,29 +88,29 @@ public class MenuBtn {
      *
      * @return
      */
-    public static MenuBtn rightMenu_btnColumn() {
-        return MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build();
+    public static MenuBtn rightMenu_btnColumn(int userLanguage) {
+        return MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName(SystemEnv.getHtmlLabelName(547136,userLanguage)).type("BTN_COLUMN").build();
     }
 
     /**
      * 获取常用按钮列表
      * @return
      */
-    public static Map<String, List<MenuBtn>> getCommonBtnDatas() {
+    public static Map<String, List<MenuBtn>> getCommonBtnDatas(int userLanguage) {
         Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 新增
-        topMenuList.add(MenuBtn.topMenu_addNew());
+        topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
         // 批量删除
-        topMenuList.add(MenuBtn.topMenu_batchDelete());
+        topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
         btnDatas.put("topMenu", topMenuList);
         // 新增
-        rightMenuList.add(MenuBtn.rightMenu_addNew());
+        rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
         // 日志
-        rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
         // 显示列定制
-        rightMenuList.add(MenuBtn.rightMenu_btnColumn());
+        rightMenuList.add(MenuBtn.rightMenu_btnColumn(userLanguage));
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }
@@ -118,19 +119,19 @@ public class MenuBtn {
      * 获取常用按钮列表
      * @return
      */
-    public static Map<String, List<MenuBtn>> getDatasNoBtnColum() {
+    public static Map<String, List<MenuBtn>> getDatasNoBtnColum(int userLanguage) {
         Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 新增
-        topMenuList.add(MenuBtn.topMenu_addNew());
+        topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
         // 批量删除
-        topMenuList.add(MenuBtn.topMenu_batchDelete());
+        topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
         btnDatas.put("topMenu", topMenuList);
         // 新增
-        rightMenuList.add(MenuBtn.rightMenu_addNew());
+        rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
         // 日志
-        rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
         // 显示列定制
         // rightMenuList.add(MenuBtn.rightMenu_btnColumn());
         btnDatas.put("rightMenu", rightMenuList);
@@ -141,23 +142,23 @@ public class MenuBtn {
      * 获取常用按钮列表
      * @return
      */
-    public static Map<String, List<MenuBtn>> getDatasHasCopy() {
+    public static Map<String, List<MenuBtn>> getDatasHasCopy(int userLanguage) {
         Map<String, List<MenuBtn>> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
         // 新增
-        topMenuList.add(MenuBtn.topMenu_addNew());
+        topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
         // 批量删除
-        topMenuList.add(MenuBtn.topMenu_batchDelete());
+        topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
         // 复制
-        topMenuList.add(MenuBtn.topMenu_copy());
+        topMenuList.add(MenuBtn.topMenu_copy(userLanguage));
         btnDatas.put("topMenu", topMenuList);
         // 新增
-        rightMenuList.add(MenuBtn.rightMenu_addNew());
+        rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
         // 复制
         // rightMenuList.add(MenuBtn.rightMenu_copy());
         // 日志
-        rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }

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

@@ -8,6 +8,7 @@ import com.api.browser.util.ConditionFactory;
 import com.api.browser.util.ConditionType;
 import com.engine.organization.entity.browser.po.CustomBrowserBean;
 import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,6 +49,11 @@ public class OrganizationFormItemUtil {
         return select;
     }
 
+    public static SearchConditionItem selectItem(User user, List<SearchConditionOption> selectOptions, int colSpan, int fieldcol,
+                                                 int labelcol, boolean isQuickSearch, int label, String name) {
+        return selectItem(user,selectOptions,colSpan,fieldcol,labelcol,isQuickSearch,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name);
+    }
+
 
     /**
      * checkbox
@@ -119,6 +125,11 @@ public class OrganizationFormItemUtil {
         return input;
     }
 
+    public static SearchConditionItem inputItem(User user, int colSpan, int fieldcol,
+                                                int viewAttr, int length, int label, String name) {
+        return inputItem(user, colSpan, fieldcol, viewAttr, length, SystemEnv.getHtmlLabelName(label, user.getLanguage()), name);
+    }
+
 
     /**
      * 浏览按钮
@@ -190,11 +201,20 @@ public class OrganizationFormItemUtil {
             CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class);
             customBrowserBean.setHasLeftTree(true);
             customBrowserBean.setLeftToSearchKey("treeKey");
+
+            Map<String, Object> map = new HashMap<>(2);
+            map.put("width", 988);
+            customBrowserBean.setModalStyle(map);
             browser.setBrowserConditionParam(customBrowserBean);
         }
         return browser;
     }
 
+    public static SearchConditionItem browserItem(User user, int colSpan, int fieldcol,
+                                                  int viewAttr, boolean isQuickSearch, int label, String type, String name, String fieldDbType) {
+        return browserItem(user, colSpan, fieldcol, viewAttr, isQuickSearch, SystemEnv.getHtmlLabelName(label, user.getLanguage()), type, name, fieldDbType);
+    }
+
 
     /**
      * 日期区间
@@ -245,9 +265,15 @@ public class OrganizationFormItemUtil {
         return textarea;
     }
 
+    public static SearchConditionItem textareaItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
+                                                   int viewAttr, int length, int label, String name) {
+        return textareaItem(user,colSpan,fieldcol,isQuickSearch,viewAttr,length,SystemEnv.getHtmlLabelName(label, user.getLanguage()),name);
+    }
+
 
     /**
      * 日期组合
+     *
      * @param user
      * @param colSpan
      * @param fieldcol
@@ -258,7 +284,7 @@ public class OrganizationFormItemUtil {
      * @return
      */
     public static SearchConditionItem dateItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
-                                                     int viewAttr, String label, String name) {
+                                               int viewAttr, String label, String name) {
         ConditionFactory conditionFactory = new ConditionFactory(user);
         SearchConditionItem date = conditionFactory.createCondition(ConditionType.DATE, 502227, name);
         date.setColSpan(colSpan);
@@ -269,8 +295,12 @@ public class OrganizationFormItemUtil {
         return date;
     }
 
+    public static SearchConditionItem dateItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
+                                               int viewAttr, int label, String name) {
+        return dateItem(user,colSpan,fieldcol,isQuickSearch,viewAttr,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name);
+    }
+
     /**
-     *
      * @param user
      * @param colSpan
      * @param fieldcol
@@ -294,7 +324,7 @@ public class OrganizationFormItemUtil {
 
 
     public static SearchConditionItem dateGroupItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
-                                                     int viewAttr, String label, String name) {
+                                                    int viewAttr, String label, String name) {
         ConditionFactory conditionFactory = new ConditionFactory(user);
         SearchConditionItem dateGroup = conditionFactory.createCondition(ConditionType.DATEGROUP, 502227, name);
         dateGroup.setColSpan(colSpan);
@@ -303,22 +333,22 @@ public class OrganizationFormItemUtil {
         dateGroup.setViewAttr(viewAttr);
         dateGroup.setLabel(label);
         List<Object> datas = new ArrayList<>();
-        datas.add(new DateGroupData("全部","0"));
-        datas.add(new DateGroupData("今天","1"));
-        datas.add(new DateGroupData("本周","2"));
-        datas.add(new DateGroupData("本月","3"));
-        datas.add(new DateGroupData("本季","4"));
-        datas.add(new DateGroupData("本年","5"));
-        datas.add(new DateGroupData("上个月","7"));
-        datas.add(new DateGroupData("上一年","8"));
-        datas.add(new DateGroupData("指定日期范围","6"));
+        datas.add(new DateGroupData("全部", "0"));
+        datas.add(new DateGroupData("今天", "1"));
+        datas.add(new DateGroupData("本周", "2"));
+        datas.add(new DateGroupData("本月", "3"));
+        datas.add(new DateGroupData("本季", "4"));
+        datas.add(new DateGroupData("本年", "5"));
+        datas.add(new DateGroupData("上个月", "7"));
+        datas.add(new DateGroupData("上一年", "8"));
+        datas.add(new DateGroupData("指定日期范围", "6"));
         dateGroup.setDatas(datas);
         dateGroup.setValue(new ArrayList<>());
         dateGroup.setDateGroup(true);
         return dateGroup;
     }
 
-    static class DateGroupData{
+    static class DateGroupData {
         private String name;
         private String value;
 

src/com/engine/organization/util/page/Column.java

@@ -16,8 +16,10 @@ public class Column {
     boolean display;
     String width;
     boolean sorter;
+    int labelId;
 
-    public Column(String title, String dataIndex, String key, String width) {
+    public Column(int labelId, String title, String dataIndex, String key, String width) {
+        this.labelId = labelId;
         this.title = title;
         this.dataIndex = dataIndex;
         this.key = key;

src/com/engine/organization/util/page/PageInfo.java

@@ -4,6 +4,8 @@ import com.engine.organization.annotation.TableTitle;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -11,7 +13,7 @@ import java.util.List;
 
 @Data
 @ToString
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
     Class<T> clazz;
 
@@ -25,23 +27,23 @@ public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
     public PageInfo() {
     }
 
-    public PageInfo(Class<T> clazz) {
+    public PageInfo(User user, Class<T> clazz) {
         this.clazz = clazz;
-        this.columns = buildColumns();
+        this.columns = buildColumns(user);
     }
 
     public PageInfo(List<T> list) {
         super(list);
     }
 
-    public PageInfo(List<T> list, Class<T> clazz) {
+    public PageInfo(User user, List<T> list, Class<T> clazz) {
         super(list);
         this.clazz = clazz;
-        this.columns = buildColumns();
+        this.columns = buildColumns(user);
     }
 
 
-    public List<Column> buildColumns() {
+    public List<Column> buildColumns(User user) {
         if (clazz == null) {
             return this.columns;
         }
@@ -56,7 +58,8 @@ public class PageInfo<T> extends com.github.pagehelper.PageInfo<T> {
                 boolean display = annotation.display();
                 String width = annotation.width();
                 boolean sorter = annotation.sorter();
-                Column column = Column.builder().sorter(sorter).width(width).title(title).dataIndex(dataIndex).key(key).display(display).build();
+                int labelId = annotation.labelId();
+                Column column = Column.builder().sorter(sorter).width(width).title(-1 != labelId ? SystemEnv.getHtmlLabelName(labelId, user.getLanguage()) : title).dataIndex(dataIndex).key(key).display(display).build();
                 columns.add(column);
             }
         }

src/com/engine/organization/util/response/ResultCode.java

@@ -1,22 +1,24 @@
 package com.engine.organization.util.response;
 
-public enum  ResultCode implements IErrorCode {
-    SUCCESS(200,"操作成功"),
-    FAILED(500,"操作失败"),
-    VALIDATE_FAILED(404,"参数检验失败"),
-    UNAUTHORIZED(401,"暂未登陆或相关token已经过期"),
-    FORBIDDEN(403,"没有相关权限"),
+public enum ResultCode implements IErrorCode {
+    SUCCESS(200, "操作成功", 547157),
+    FAILED(500, "操作失败", 547158),
+    VALIDATE_FAILED(404, "参数检验失败", -1),
+    UNAUTHORIZED(401, "暂未登陆或相关token已经过期", -1),
+    FORBIDDEN(403, "没有相关权限", -1),
 
 
-    BODY_NOT_MATCH(400,"请求的数据格式不符!"),
-    INTERNAL_SERVER_ERROR(500, "服务器内部错误!"),
-    SERVER_BUSY(503,"服务器正忙，请稍后再试!");
+    BODY_NOT_MATCH(400, "请求的数据格式不符!", -1),
+    INTERNAL_SERVER_ERROR(500, "服务器内部错误!", -1),
+    SERVER_BUSY(503, "服务器正忙，请稍后再试!", -1);
     private long code;
     private String msg;
+    private int labelId;
 
-    ResultCode(long code, String msg) {
+    ResultCode(long code, String msg, int labelId) {
         this.code = code;
         this.msg = msg;
+        this.labelId = labelId;
     }
 
     @Override
@@ -28,11 +30,18 @@ public enum  ResultCode implements IErrorCode {
     public String getMessage() {
         return msg;
     }
+
+    @Override
+    public int getLabelId() {
+        return labelId;
+    }
 }
 
 interface IErrorCode {
     long getCode();
 
     String getMessage();
+
+    int getLabelId();
 }
 

src/com/engine/organization/util/response/ReturnResult.java

@@ -8,6 +8,8 @@ package com.engine.organization.util.response;
  **/
 
 import weaver.general.BaseBean;
+import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
 
 import java.io.Serializable;
 
@@ -111,11 +113,24 @@ public class ReturnResult<T> implements Serializable {
      * @param data
      * @return
      */
+    @Deprecated
     public static <T> ReturnResult<T> successed(T data) {
 
         return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data);
     }
 
+    /**
+     * 多语言响应
+     *
+     * @param user
+     * @param data
+     * @param <T>
+     * @return
+     */
+    public static <T> ReturnResult<T> successed(User user, T data) {
+        return new ReturnResult<>(ResultCode.SUCCESS.getCode(), SystemEnv.getHtmlLabelName(ResultCode.SUCCESS.getLabelId(), user.getLanguage()), data);
+    }
+
     /**
      * 异常处理
      *

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

@@ -198,7 +198,7 @@ public class CompanyImport {
                         } else if (StringUtils.isBlank(cellValue)) {
                             reallyValue = "";
                         } else {
-                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem());
+                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true);
                         }
                     } catch (Exception e) {
                         historyDetailPO.setOperateDetail(cellValue + "转换失败");

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

@@ -209,7 +209,7 @@ public class DepartmentImport {
                         } else if (StringUtils.isBlank(cellValue)) {
                             reallyValue = "";
                         } else {
-                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem());
+                            reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true);
                         }
                     } catch (Exception e) {
                         historyDetailPO.setOperateDetail(cellValue + "转换失败");

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

@@ -41,7 +41,7 @@ public class PostInfoImportUtil {
 
     }
     public static Long saveImport(String operateType, String excelFile, User user) {
-        Long importHistoryId = OrgImportUtil.saveImportLog("staff_info", operateType, user);
+        Long importHistoryId = OrgImportUtil.saveImportLog("post_info", operateType, user);
         JclImportHistoryDetailPO historyDetailPO;
 
         ImageFileManager manager = new ImageFileManager();
@@ -116,7 +116,7 @@ public class PostInfoImportUtil {
                         List<PostInfoPO> postInfoPOS = MapperProxyFactory.getProxy(PostInfoMapper.class).listByNo(Util.null2String(reallyValue));
                         if(postInfoPOS.size()>0){
                             historyDetailPO.setRelatedName("");
-                            historyDetailPO.setOperateDetail("编号:" + reallyValue + ",编号不允许重复");
+                            historyDetailPO.setOperateDetail("编号:" + reallyValue + ","+SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
                             historyDetailPO.setStatus("0");
                             OrgImportUtil.saveImportDetailLog(historyDetailPO);
                             continue nextRow;

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

@@ -0,0 +1,204 @@
+package com.engine.organization.util.saveimport;
+
+
+import com.engine.organization.entity.extend.po.ExtendInfoPO;
+import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO;
+
+import com.engine.organization.entity.scheme.po.SchemePO;
+import com.engine.organization.entity.sequence.po.SequencePO;
+import com.engine.organization.mapper.comp.CompMapper;
+import com.engine.organization.mapper.scheme.SchemeMapper;
+import com.engine.organization.mapper.sequence.SequenceMapper;
+import com.engine.organization.util.OrganizationAssert;
+import com.engine.organization.util.db.MapperProxyFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import weaver.file.ImageFileManager;
+import weaver.general.Util;
+import weaver.hrm.User;
+import weaver.systeminfo.SystemEnv;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * @Description: 岗位序列
+ * @Author: liang.cheng
+ * @Date: 2024/3/12 2:17 PM
+ * @param:
+ * @return:
+ */
+public class SequenceImportUtil {
+    static Map<String, ExtendInfoPO> importFieldsMap;
+
+    static {
+        importFieldsMap = new HashMap<>();
+        importFieldsMap.put("编号", ExtendInfoPO.builder().tableName("jcl_org_sequence").fieldName("sequence_no").fieldNameDesc("编号").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
+        importFieldsMap.put("名称", ExtendInfoPO.builder().tableName("jcl_org_sequence").fieldName("sequence_name").fieldNameDesc("名称").isrequired(1).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
+        importFieldsMap.put("等级方案", ExtendInfoPO.builder().tableName("jcl_org_sequence").fieldName("scheme_name").fieldNameDesc("等级方案").isrequired(1).controlType(1).browserType("3").customValue("[\"input\",\"text\",\"100\"]").build());
+        importFieldsMap.put("方案所属分部", ExtendInfoPO.builder().tableName("jcl_org_sequence").fieldName("subcompanyname").fieldNameDesc("方案所属分部").isrequired(1).controlType(1).browserType("3").customValue("[\"input\",\"text\",\"100\"]").build());
+        importFieldsMap.put("描述说明", ExtendInfoPO.builder().tableName("jcl_org_sequence").fieldName("description").fieldNameDesc("描述说明").isrequired(0).controlType(1).browserType("1").customValue("[\"input\",\"text\",\"100\"]").build());
+
+    }
+
+
+
+    public static Long saveImport(String operateType, String excelFile, User user) {
+        Long importHistoryId = OrgImportUtil.saveImportLog("sequence_info", operateType, user);
+        JclImportHistoryDetailPO historyDetailPO;
+
+        ImageFileManager manager = new ImageFileManager();
+        manager.getImageFileInfoById(Util.getIntValue(excelFile));
+        XSSFWorkbook workbook;
+        try {
+            workbook = new XSSFWorkbook(manager.getInputStream());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        // 当前sheet
+        XSSFSheet sheetAt = workbook.getSheetAt(0);
+        int lastRow = sheetAt.getLastRowNum();
+        OrganizationAssert.isTrue(lastRow > 0, "文件数据为空");
+        short lastCellNum = sheetAt.getRow(0).getLastCellNum();
+        List<ExtendInfoPO> extendInfoPOS = new ArrayList<>();
+        Date currDate = new Date();
+        // 遍历每一行数据
+        nextRow:
+        for (int i = 0; i <= lastRow; i++) {
+            historyDetailPO = new JclImportHistoryDetailPO();
+            historyDetailPO.setPid(importHistoryId);
+            XSSFRow row = sheetAt.getRow(i);
+            if (null == row) {
+                continue;
+            }
+
+            // 组装待处理数据
+            Map<String, Object> map = new HashMap<>(16);
+            Integer parentCompanyId = null;
+
+            historyDetailPO.setRowNums(String.valueOf(i + 1));
+            for (int cellIndex = 0; cellIndex < lastCellNum; cellIndex++) {
+                XSSFCell cell = row.getCell((short) cellIndex);
+                String cellValue = OrgImportUtil.getCellValue(cell).trim();
+                if (i == 0) {
+                    // 首行 初始化字段信息
+                    ExtendInfoPO extendInfoPO = importFieldsMap.get(cellValue);
+                    extendInfoPOS.add(extendInfoPO);
+                } else {
+                    ExtendInfoPO infoPO = extendInfoPOS.get(cellIndex);
+                    // 数据校验
+                    if (infoPO.getIsrequired() == 1 && StringUtils.isBlank(cellValue)) {
+                        historyDetailPO.setRelatedName("");
+                        historyDetailPO.setOperateDetail(infoPO.getFieldNameDesc() + "为必填项");
+                        historyDetailPO.setStatus("0");
+                        OrgImportUtil.saveImportDetailLog(historyDetailPO);
+                        continue nextRow;
+                    }
+
+                    Object reallyValue = cellValue;
+
+                    if ("subcompanyname".equalsIgnoreCase(infoPO.getFieldName())) {
+                        historyDetailPO.setRelatedName(cellValue);
+                        String[] split = cellValue.split(">");
+                        if (split.length > 0) {
+                            if (split.length > 8) {
+                                historyDetailPO.setOperateDetail("分部层级不能大于10");
+                                historyDetailPO.setStatus("0");
+                                OrgImportUtil.saveImportDetailLog(historyDetailPO);
+                                continue nextRow;
+                            }
+                            for (int index = 0; index <= split.length - 1; index++) {
+                                parentCompanyId = MapperProxyFactory.getProxy(CompMapper.class).getIdByNameAndPid(split[index], parentCompanyId == null ? 0 : parentCompanyId);
+                                if (null == parentCompanyId) {
+                                    historyDetailPO.setOperateDetail(split[index] + "分部未找到对应数据");
+                                    historyDetailPO.setStatus("0");
+                                    OrgImportUtil.saveImportDetailLog(historyDetailPO);
+                                    continue nextRow;
+                                }
+                            }
+                        }
+                        map.put("subcompanyid", Util.null2String(parentCompanyId));
+                    }
+
+                    // 编号是否重复
+                    if ("sequence_no".equals(infoPO.getFieldName())){
+                        List<SequencePO> sequencePOS = MapperProxyFactory.getProxy(SequenceMapper.class).listByNo(Util.null2String(reallyValue));
+                        if(sequencePOS.size()>0){
+                            historyDetailPO.setRelatedName("");
+                            historyDetailPO.setOperateDetail("编号:" + reallyValue + ","+SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
+                            historyDetailPO.setStatus("0");
+                            OrgImportUtil.saveImportDetailLog(historyDetailPO);
+                            continue nextRow;
+                        }
+                    }
+
+                    map.put(infoPO.getFieldName(), reallyValue);
+
+                }
+            }
+            if (i == 0) {
+                continue nextRow;
+            }
+          String subCompanyName = (String) map.get("scheme_name");
+          String subCompanyId = (String) map.get("subcompanyid");
+
+          List<SchemePO> schemePOS = MapperProxyFactory.getProxy(SchemeMapper.class).selectByParams(Integer.parseInt(subCompanyId), subCompanyName);
+          if (schemePOS.size() == 0){
+              historyDetailPO.setRelatedName("");
+              historyDetailPO.setOperateDetail("第"+i+"行,所属分部下的等级方案不存在");
+              historyDetailPO.setStatus("0");
+              OrgImportUtil.saveImportDetailLog(historyDetailPO);
+              continue nextRow;
+          }
+
+            SequencePO build = SequencePO.builder()
+                    .sequenceNo((String) map.get("sequence_no"))
+                    .sequenceName((String) map.get("sequence_name"))
+                    .schemeId(schemePOS.get(0).getId())
+                    .description((String) map.get("description"))
+                    .build();
+            MapperProxyFactory.getProxy(SequenceMapper.class).insertIgnoreNull(build);
+            historyDetailPO.setOperateDetail("添加成功");
+            historyDetailPO.setStatus("1");
+            OrgImportUtil.saveImportDetailLog(historyDetailPO);
+        }
+
+        return importHistoryId;
+    }
+
+
+    public static List<Map<String, Object>> importForm(User user) {
+        // 返回导入数据
+        List<Map<String, Object>> lsGroup = new ArrayList<>();
+        Map<String, Object> groupItem = new HashMap<>(3);
+        List<Object> itemList = new ArrayList<>();
+        groupItem.put("title", SystemEnv.getHtmlLabelName(33803, Util.getIntValue(user.getLanguage())));
+        groupItem.put("defaultshow", true);
+        List<Integer> lsPromptLabel = new ArrayList<>();
+        lsPromptLabel.add(34275);
+        lsPromptLabel.add(125452);
+
+        for (int i = 0; i < lsPromptLabel.size(); i++) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("index", (i + 1));
+            String value = Util.toScreen(SystemEnv.getHtmlLabelName(lsPromptLabel.get(i), user.getLanguage()), user.getLanguage());
+            if (i == 0) {
+                value += SystemEnv.getHtmlLabelName(28576, user.getLanguage());
+                item.put("link", "/hrm/import/template/sequence.xls");
+            }
+            item.put("value", value);
+            itemList.add(item);
+        }
+        Map<String,Object> map = new HashMap<String,Object>(2){{
+            put("index",3);
+            put("value","分部的层级关系用字符>分割。");
+        }};
+        itemList.add(map);
+        groupItem.put("items", itemList);
+        lsGroup.add(groupItem);
+        return lsGroup;
+    }
+}

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

@@ -47,7 +47,7 @@ public class SchemeController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getSchemeWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getSchemeWrapper(user).listPage(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -66,7 +66,7 @@ public class SchemeController {
     public ReturnResult saveScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SchemeSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSchemeWrapper(user).save(param));
+            return ReturnResult.successed(user,getSchemeWrapper(user).save(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -86,7 +86,7 @@ public class SchemeController {
     public ReturnResult updateScheme(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SchemeSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSchemeWrapper(user).updateScheme(param));
+            return ReturnResult.successed(user,getSchemeWrapper(user).updateScheme(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -107,7 +107,7 @@ public class SchemeController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SchemeSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSchemeWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getSchemeWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -128,7 +128,7 @@ public class SchemeController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSchemeWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getSchemeWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -141,7 +141,7 @@ public class SchemeController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getSchemeWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getSchemeWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -155,7 +155,7 @@ public class SchemeController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getSchemeWrapper(user).getSchemeForm(map));
+            return ReturnResult.successed(user,getSchemeWrapper(user).getSchemeForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -167,7 +167,7 @@ public class SchemeController {
     public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSchemeWrapper(user).getTableBtn());
+            return ReturnResult.successed(user,getSchemeWrapper(user).getTableBtn());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -179,7 +179,7 @@ public class SchemeController {
     public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSchemeWrapper(user).getTreeData());
+            return ReturnResult.successed(user,getSchemeWrapper(user).getTreeData());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -21,7 +21,7 @@ import javax.ws.rs.core.MediaType;
 import java.util.Map;
 
 /**
- * @description:
+ * @description: 岗位序列
  * @author:dxfeng
  * @createTime: 2022/05/12
  * @version: 1.0

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

@@ -1,5 +1,6 @@
 package com.engine.organization.wrapper;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.api.browser.bean.SearchConditionGroup;
 import com.engine.common.util.ServiceUtil;
@@ -9,21 +10,23 @@ import com.engine.organization.entity.company.po.CompPO;
 import com.engine.organization.entity.department.param.*;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.department.vo.SingleDeptTreeVO;
+import com.engine.organization.entity.hrmresource.po.ResourceChartPO;
 import com.engine.organization.entity.job.vo.SingleJobTreeVO;
 import com.engine.organization.entity.searchtree.SearchTreeParams;
 import com.engine.organization.enums.LogModuleNameEnum;
 import com.engine.organization.enums.OperateTypeEnum;
 import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
+import com.engine.organization.mapper.resource.HrmResourceMapper;
 import com.engine.organization.service.DepartmentService;
 import com.engine.organization.service.impl.DepartmentServiceImpl;
+import com.engine.organization.util.HrmStatusHistoryUtil;
 import com.engine.organization.util.MenuBtn;
 import com.engine.organization.util.OrganizationWrapper;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.page.PageInfo;
 import com.engine.organization.util.response.ReturnResult;
 import org.apache.commons.lang.StringUtils;
-import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.util.Collection;
@@ -46,6 +49,10 @@ public class DepartmentWrapper extends OrganizationWrapper {
     private DepartmentMapper getDepartmentMapper() {
         return MapperProxyFactory.getProxy(DepartmentMapper.class);
     }
+    private HrmResourceMapper getHrmResourceMapper() {
+        return MapperProxyFactory.getProxy(HrmResourceMapper.class);
+    }
+
     private CompMapper getCompMapper() {
         return MapperProxyFactory.getProxy(CompMapper.class);
     }
@@ -236,7 +243,12 @@ public class DepartmentWrapper extends OrganizationWrapper {
     @Log(operateType = OperateTypeEnum.MERGE, operateDesc = "合并部门", operateModule = LogModuleNameEnum.DEPARTMENT)
     public int mergeDepartment(DepartmentMergeParam mergeParam) {
         DepartmentPO departmentPO = getDepartmentMapper().getDeptById(mergeParam.getId());
+        //被合并的部门人员工作记录表记录调动
+        List<ResourceChartPO> resourceChartPOList = getHrmResourceMapper().selectByDepartmentId(mergeParam.getId());
         int mergeDepartment = getDepartmentService(user).mergeDepartment(mergeParam);
+        if (CollectionUtil.isNotEmpty(resourceChartPOList)) {
+            HrmStatusHistoryUtil.personWorkRecord(resourceChartPOList,mergeParam.getDepartment(),"合并部门");
+        }
         writeOperateLog(new Object() {
         }.getClass(), departmentPO.getDepartmentName(), JSON.toJSONString(mergeParam), departmentPO, getDepartmentMapper().getDeptById(departmentPO.getId()));
         return mergeDepartment;

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

@@ -199,7 +199,7 @@ public class JobWrapper extends OrganizationWrapper {
     public ReturnResult getCopyForm() {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "4", "department", "deptBrowser");
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547261, "4", "department", "deptBrowser");
         deptBrowserItem.setRules("required|string");
         condition.add(deptBrowserItem);
         addGroups.add(new SearchConditionGroup("", true, condition));

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

@@ -37,7 +37,7 @@ public class ManagerDetachWrapper extends OrganizationWrapper {
     }
 
     public Map<String, List<MenuBtn>> getTableBtn() {
-        return MenuBtn.getCommonBtnDatas();
+        return MenuBtn.getCommonBtnDatas(user.getLanguage());
     }
 
     public Map<String, Object> getSearchCondition() {

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

@@ -53,20 +53,21 @@ public class ResourceBasicInfoWrapper extends OrganizationWrapper {
         Map<String, Object> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
+        int userLanguage = user.getLanguage();
         // 新增
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("addItemClass").menuIcon("icon-coms-New-Flow").menuName("新增类型").type("BTN_AddItemClass").build());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("editItemClass").menuIcon("icon-coms-edit").menuName("修改类型").type("BTN_EditItemClass").build());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("delItemClass").menuIcon("icon-coms-Delete").menuName("删除类型").type("BTN_DelItemClass").build());
-        topMenuList.add(MenuBtn.topMenu_addNew());
+        topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
         // 批量删除
-        topMenuList.add(MenuBtn.topMenu_batchDelete());
+        topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
         btnDatas.put("topMenu", topMenuList);
         // 新增
-        rightMenuList.add(MenuBtn.rightMenu_addNew());
+        rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
         // 日志
-        rightMenuList.add(MenuBtn.rightMenu_btnLog());
+        rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
         // 显示列定制
-        rightMenuList.add(MenuBtn.rightMenu_btnColumn());
+        rightMenuList.add(MenuBtn.rightMenu_btnColumn(userLanguage));
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }

src/weaver/interfaces/organization/cronjob/JobAndPlanCron.java

@@ -18,6 +18,7 @@ import java.util.List;
 /**
  * 定时任务刷新在岗数、编制数
  */
+@Deprecated
 public class JobAndPlanCron extends BaseCronJob {
 
     private static final Logger LOGGER = LoggerFactory.getLogger("chartDataLog");