拓荆科技二开 组织架构图岗位显示改造

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

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

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

@@ -58,6 +58,14 @@ public class ChartPO {
     // 编制数
     private int staffNum;
 
+    //是否关键岗
+    private Integer keyJob;
+
+    //bk人员
+    private String bkPerson;
+
+
+
     public String getId() {
         if (StringUtils.isNotBlank(ftype)) {
             switch (ftype) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12,7 +12,6 @@
         <result column="departmentCode" property="departmentCode"/>
         <result column="coadjutant" property="coadjutant"/>
         <result column="showOrder" property="showOrder"/>
-        <result column="showOrderOfTree" property="showOrderOfTree"/>
         <result column="uuid" property="uuid"/>
     </resultMap>
 
@@ -31,7 +30,6 @@
         t.departmentCode,
         t.coadjutant,
         t.showOrder,
-        t.showOrderOfTree,
         t.uuid
     </sql>
 
@@ -98,7 +96,7 @@
     <select id="listDeptsByIds" resultType="java.util.Map">
         select
         id as "id",
-        departmentMark as "name"
+        departmentName as "name"
         from hrmdepartment t
         WHERE id IN
         <foreach collection="ids" open="(" item="id" separator="," close=")">

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

@@ -130,7 +130,7 @@ public interface JobMapper {
      *
      * @return
      */
-    Double getMaxShowOrder();
+    Integer getMaxShowOrder();
 
     /**
      * 根据名字和上级查询岗位信息
@@ -141,7 +141,7 @@ public interface JobMapper {
      * @param parentJob
      * @return
      */
-    List<JobPO> getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob,
+    Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob,
                            @Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark);
 
     int updateJobCompany(@Param("ids") Collection<Long> ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany);

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

@@ -467,7 +467,7 @@
             and t.forbidden_tag = #{jobPO.forbiddenTag}
         </if>
     </select>
-    <select id="getMaxShowOrder" resultType="java.lang.Double">
+    <select id="getMaxShowOrder" resultType="java.lang.Integer">
         select max(show_order)
         from jcl_org_job
     </select>
@@ -482,10 +482,8 @@
           and delete_type = 0
     </select>
 
-    <select id="getIdByNameAndPid" resultMap="BaseResultMap">
-        select
-        <include refid="baseColumns"/>
-        from jcl_org_job t
+    <select id="getIdByNameAndPid" resultType="java.lang.Long">
+        select t.id from jcl_org_job t
         left join hrmjobtitles h on t.ec_jobTitle = h.id
         left join hrmjobactivities j on h.jobactivityid = j.id
         left join hrmjobgroups f on j.jobgroupid = f.id

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

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

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

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

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

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

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

@@ -218,6 +218,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         return result;
     }
 
+    @SneakyThrows
     @Override
     public Map<String, Object> getDepartmentDetail(Map<String, Object> params) {
         String rootId = Util.null2String(params.get("rootId"));
@@ -303,7 +304,7 @@ public class ChartServiceImpl extends Service implements ChartService {
             // 查询部门下的岗位
             if (isRealTime) {
                 String subcompanyid1 = new DepartmentComInfo().getSubcompanyid1(departmentId);
-                sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '" + departmentId + "' and b.ec_company='" + subcompanyid1 + "'";
+                sql = "select a.id,a.jobtitlename as name,b.bkhrm,b.is_key from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.delete_type is null or b.delete_type = 0) where b.ec_department = '" + departmentId + "' and b.ec_company='" + subcompanyid1 + "'";
             } else {
                 rs.executeQuery("select subcompanyid from jcl_chart_department where departmentid = '" + departmentId + "' and versionid = " + versionId);
                 rs.next();
@@ -311,6 +312,9 @@ public class ChartServiceImpl extends Service implements ChartService {
                 sql = "select jobid as id ,jobname as name from jcl_chart_job where departmentid = '" + departmentId + "' and subcompanyid =  '" + subcompanyid + "' and versionid = " + versionId;
             }
             rs.executeQuery(sql);
+
+            ResourceComInfo rc = new ResourceComInfo();
+
             while (rs.next()) {
                 ChartPO chartPO = new ChartPO();
                 chartPO.setFtype("3");
@@ -321,6 +325,11 @@ public class ChartServiceImpl extends Service implements ChartService {
                 chartPO.setParentId(rootId);
                 chartPO.setExpand("1");
                 chartPO.setHasChildren("1");
+                if (isRealTime) {
+                    chartPO.setKeyJob(Util.getIntValue(rs.getString("is_key")));
+                    chartPO.setBkPerson(rc.getLastname(Util.null2String(rs.getString("bkhrm"))));
+                }
+
                 jobTitleList.add(chartPO);
             }
 
@@ -715,9 +724,9 @@ public class ChartServiceImpl extends Service implements ChartService {
     }
 
     @Override
-    public Map<String, HrmLabelVO> selectLabel() {
+    public Map<Integer, HrmLabelVO> selectLabel() {
         RecordSet rs = new RecordSet();
-        Map<String, HrmLabelVO> labelData = new HashMap<>();
+        Map<Integer, HrmLabelVO> labelData = new HashMap<>();
         //labelId集合
         List<Integer> labelIds = Arrays.asList(547190,547194,547196,547262,547282,547283,547284,547285,547286,547287,547292,547293,547294,547296,547298,547299,547300,547301,547302,547303,547304,547305,547307,547310,547313,547314,547315,547316,547317,
                 547318,547319,547320,547321,547322,547323,547324,547326,547327,547328,547329,547330,547331,547332,547333,547334,547345,547346,547447,547448,547468,547473,547475,547476,547477,547478,547478,547264,547265,547463,547464,547465,
@@ -726,7 +735,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         labelIds.forEach(item -> {
             rs.executeQuery("select labelName from HtmlLabelInfo where indexid = ? and languageid = ?",item,user.getLanguage());
             if (rs.next()){
-                labelData.put(Util.null2String(item),HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
+                labelData.put(item,HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
             }
 
         });
@@ -1007,7 +1016,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 ";
             deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1  as subcompanyid, " +
                     "b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," +
-                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,d.bmfzr as fleader,e.on_job_num,e.staff_num " +
+                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " +
                     "from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " +
                     "left join hrmdepartment c on a.supdepid = c.id " +
                     "left join hrmdepartmentdefined d on a.id=d.deptid " +
@@ -1040,13 +1049,12 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "               a.departmentcode,\n" +
                     "               a.coadjutant,\n" +
                     "               a.tlevel,\n" +
-                    "               e.bmfzr          as fleader,\n" +
+                    "               a.bmfzr          as fleader,\n" +
                     "               d.on_job_num,\n" +
                     "               d.staff_num" +
                     "        from hrmdepartment a\n" +
                     "                 left join hrmsubcompany b on a.subcompanyid1 = b.id\n" +
                     "                 left join hrmdepartment c on a.supdepid = c.id\n" +
-                    "                 left join hrmdepartmentdefined e on a.id=e.deptid\n" +
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=2 ";
         }
 
@@ -1672,6 +1680,9 @@ public class ChartServiceImpl extends Service implements ChartService {
      * @return 人员名称
      */
     private String getDepartmentLeader(String ids) {
+        if (!isRealTime) {
+            return ids;
+        }
         if (StringUtils.isBlank(ids)) {
             return "";
         }

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

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

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

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

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

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

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

@@ -15,6 +15,7 @@ import com.engine.organization.entity.department.bo.DepartmentBO;
 import com.engine.organization.entity.department.dto.DepartmentListDTO;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO;
+import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
 import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
 import com.engine.organization.entity.staff.po.StaffPO;
 import com.engine.organization.entity.staff.vo.StaffTableVO;
@@ -44,6 +45,7 @@ import weaver.systeminfo.SystemEnv;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -167,7 +169,6 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
 
         List<String> columnList = Arrays.asList(columns.split(","));
         String propValue = new BaseBean().getPropValue("hrmOrganization", "orgId");
-        Map<String, WeaTableColumn> columnMap = new HashMap<>();
 
 
         BigDecimal decimal = new BigDecimal(100 / columnList.size());
@@ -195,18 +196,16 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
 
                 weaTableColumn.setOtherpara(columnName);
                 //weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
-                columnMap.put(columnName, weaTableColumn);
+                if (weaTableColumn.getDisplay().getBoolVal()) {
+                    weaTableColumnList.add(weaTableColumn);
+                    headerList.add(weaTableColumn.getColumn());
+                    headerNameList.add(weaTableColumn.getText());
+                }
             }
         }
 
-        for (String columnName : columnList) {
-            WeaTableColumn weaTableColumn = columnMap.get(columnName);
-            if (weaTableColumn != null && weaTableColumn.getDisplay().getBoolVal()) {
-                weaTableColumnList.add(weaTableColumn);
-                headerList.add(weaTableColumn.getColumn());
-                headerNameList.add(weaTableColumn.getText());
-            }
-        }
+        //todo 修复导出excel与列定制顺序
+
 
 
         // 增加id字段,跳转人员卡片

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

@@ -81,7 +81,7 @@ public class FunctionOutStaffServiceImpl {
             OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
         }
 
-        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
+        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
         //1.增加冻结数 （num为负数时为减少冻结数）
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)
@@ -233,6 +233,7 @@ public class FunctionOutStaffServiceImpl {
         bb.writeLog("编制参数"+ JSON.toJSONString(param));
         bb.writeLog("查询结果"+ JSON.toJSONString(staffPO));
         bb.writeLog("user对象"+JSON.toJSONString(user));
+        bb.writeLog("msg"+SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
         OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
         return staffPO.get(0);
     }

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

@@ -6,6 +6,7 @@ import com.api.browser.bean.SearchConditionOption;
 import com.api.browser.util.ConditionType;
 import com.api.hrm.bean.HrmFieldBean;
 import com.api.hrm.util.HrmFieldSearchConditionComInfo;
+import com.api.hrm.util.HrmTransMethod;
 import com.cloudstore.eccom.constant.WeaBoolAttr;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.cloudstore.eccom.result.WeaResultMsg;
@@ -63,10 +64,7 @@ import weaver.general.BaseBean;
 import weaver.general.StringUtil;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
-import weaver.hrm.company.DepartmentComInfo;
-import weaver.hrm.company.SubCompanyComInfo;
 import weaver.hrm.definedfield.HrmFieldManager;
-import weaver.hrm.privacy.PrivacyComInfo;
 import weaver.systeminfo.SystemEnv;
 
 import java.math.BigDecimal;
@@ -189,40 +187,25 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
         }
         List<SearchConditionItem> items = filterByDomkey(all, columnList);
-        List<String> privacyList = Arrays.asList("-1_hrm_mobile","-1_hrm_telephone","-1_hrm_mobilecall","-1_hrm_fax","-1_hrm_email");
         for (SearchConditionItem item : items) {
             String columnName = item.getDomkey()[0];
             WeaTableColumn weaTableColumn = new WeaTableColumn();
 
             if (columnName.equals("-1_cus_"+propValue)){
-                weaTableColumn.setOtherpara(columnName);
                 fields.add("t.id as " + buildTableSql(columnName).replace(".", "_"));
                 weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValue");
-            }else if(privacyList.contains(columnName)) {
-                fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
-                PrivacyComInfo pc = new PrivacyComInfo();
-                Map<String, String> mapShowSets = pc.getMapShowSets();
-                String[] parts = columnName.split("_");
-                String fieldName = parts[parts.length - 1];
-                if (mapShowSets != null && mapShowSets.get("mobile") != null) {
-                    weaTableColumn.setOtherpara("column:id+" + user.getUID() + "+"+fieldName+"");
-                    weaTableColumn.setTransmethod("weaver.hrm.privacy.PrivacyComInfo.getSearchContent");
-                }else {
-                    weaTableColumn.setOtherpara(fieldName+":"+user.getLanguage());
-                    weaTableColumn.setTransmethod("weaver.hrm.HrmTransMethod.getDefineContent");
-                }
 
-            } else{
-                weaTableColumn.setOtherpara(columnName);
+            }else{
                 fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
                 weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
             }
+
             String scopeId = columnName.split("_")[0];
             String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
 
             weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId, user.getLanguage()));
             weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
-
+            weaTableColumn.setOtherpara(columnName);
             weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
             weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
             weaTableColumnList.add(weaTableColumn);
@@ -233,7 +216,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         weaTableColumn.setColumn("id");
         weaTableColumn.setDisplay(WeaBoolAttr.FALSE);
 
-
         weaTableColumnList.add(weaTableColumn);
         fields.add("t.id");
         table.setBackfields(StringUtils.join(fields, ","));
@@ -325,8 +307,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<String> selectKeys;
         if ("custom".equals(type)) {
             if ("-1".equals(templateId)) {
-                //selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid".split(","));
-                selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_subcompanyid1,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid,-1_hrm_sporder".split(","));
+                selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid".split(","));
             } else {
                 searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
                 selectKeys = getSelectKeys(searchTemplateById);
@@ -622,7 +603,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         }
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        List<SearchConditionGroup> allConditions = getAllConditions(true);
+        List<SearchConditionGroup> allConditions = getAllConditions();
         // 穿梭框ID，展示所选字段信息
         HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
         if ("-1".equals(templateId)) {
@@ -662,7 +643,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         btnDatas.put("rightMenu", rightMenuList);
         btnDatas.put("hasRight", true);
         btnDatas.put("loginId", user.getUID());
-        btnDatas.put("cardType", new BaseBean().getPropValue("hrmOrganization", "cardType"));
         //获取当前用户使用的列定制模板Id
         btnDatas.put("customTemplateId", getCustomTemplateId());
         btnDatas.put("searchTemplateId", getSearchTemplateId());
@@ -805,25 +785,13 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         createConditionItems(hrmFieldSearchConditionComInfo, hrmFieldsByScopeId, conditionItems);
         Map<String, SearchConditionItem> allFieldsMap = conditionItems.stream().collect(Collectors.toMap(item -> item.getDomkey()[0], item -> item, (k1, k2) -> k1));
         boolean isQuickSearch = "true".equals(Util.null2String(params.get("isQuickSearch")));
-        DepartmentComInfo deptInfo = new DepartmentComInfo();
-        SubCompanyComInfo subInfo = new SubCompanyComInfo();
 
         DBType dbType = DBType.get(new RecordSet().getDBType());
         StringBuilder sb = new StringBuilder(" where 1=1 ");
-        // 默认去除外部人员显示
-        sb.append( " and t.seclevel >= 0 ");
-
         if (params.containsKey("lastName") || !params.containsKey("-1_hrm_status")) {
             // sb.append(" and t.status = 1");
             sb.append(" and t.status < 4");
         }
-        if (params.containsKey("-1_hrm_subcompanyid1")) {
-            String value = Util.null2String(params.get("-1_hrm_subcompanyid1"));
-            if (StringUtils.isNotBlank(value)) {
-                sb.append(" and t.subcompanyid1 in(").append(value).append(")");
-            }
-            params.remove("-1_hrm_subcompanyid1");
-        }
         for (Map.Entry<String, Object> entry : params.entrySet()) {
             String key = entry.getKey();
             String value = Util.null2String(entry.getValue());
@@ -834,18 +802,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                 sb.append(" and t.lastname ").append(dbType.like(value));
             }
             if ("companyId".equals(key)) {
-                ArrayList<Integer> list = new ArrayList<>();
-                list.add(Integer.parseInt(value));
-                subInfo.getSubCompanyLists(value,list);
-                String allSub = StringUtils.join(list,",");
-                sb.append(" and t.subcompanyid1 in(").append(allSub).append(")");
+                sb.append(" and t.subcompanyid1 ='").append(value).append("'");
             }
             if ("departmentId".equals(key)) {
-                ArrayList<Integer> list = new ArrayList<>();
-                list.add(Integer.parseInt(value));
-                deptInfo.getAllChildDeptByDepId(list,value);
-                String allDept = StringUtils.join(list,",");
-                sb.append(" and t.departmentId in (").append(allDept).append(")");
+                sb.append(" and t.departmentId ='").append(value).append("'");
             }
             if ("jobTitle".equals(key)) {
                 JobPO jobById = getJobMapper().getJobById(Long.parseLong(value));
@@ -1034,15 +994,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     }
 
 
-    public List<SearchConditionGroup> getAllConditions() {
-        return getAllConditions(false);
-    }
     /**
      * 获取所有搜索字段信息构建的高级搜索表单
      *
      * @return
      */
-    public List<SearchConditionGroup> getAllConditions(boolean isSearch) {
+    public List<SearchConditionGroup> getAllConditions() {
         HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> basicConditionItems = new ArrayList<>();
@@ -1053,8 +1010,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<CusFormFieldPO> hrmFieldsByScopeId = getSystemDataMapper().getHrmFieldsByScopeId(HrmGroupEnum.HRM_BASIC.getGroupType().toString());
         createConditionItems(hrmFieldSearchConditionComInfo, hrmFieldsByScopeId, basicConditionItems);
         if (CollectionUtils.isNotEmpty(basicConditionItems)) {
-            SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo,isSearch);
-            basicConditionItems.add(0,searchConditionItem);
             addGroups.add(new SearchConditionGroup(SystemEnv.getHtmlLabelName(547175, user.getLanguage()), true, basicConditionItems));
         }
 
@@ -1074,34 +1029,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         return addGroups;
     }
 
-
-    /**
-     * 花名册构建
-     *
-     * @param hrmFieldSearchConditionComInfo
-     * @param isSearch
-     * @return
-     */
-    private SearchConditionItem buildSubCompanyCondition(HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo, boolean isSearch) {
-        HrmFieldBean hrmFieldBean = new HrmFieldBean();
-        hrmFieldBean.setFieldid("");
-        hrmFieldBean.setFieldname("-1_hrm_subcompanyid1");
-        hrmFieldBean.setFieldlabel("-2458");
-        hrmFieldBean.setFieldhtmltype("3");
-        if (isSearch) {
-            hrmFieldBean.setType("170");
-        } else {
-            hrmFieldBean.setType("164");
-        }
-        hrmFieldBean.setIsQuickSearch(false);
-        hrmFieldBean.setIsScope(false);
-        hrmFieldBean.setDmlurl("");
-        hrmFieldBean.setIssystem("1");
-        hrmFieldBean.setIsFormField(true);
-        SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user);
-        return searchConditionItem;
-    }
-
     /**
      * 构建查询条件Item
      *
@@ -1154,37 +1081,32 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", scopeid);
             List<SearchConditionItem> conditionItems = new ArrayList<>();
             for (String field : fieldNames) {
-                if ("-1_hrm_subcompanyid1".equals(field)) {
-                    SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo,true);
-                    conditionItems.add(searchConditionItem);
-                } else {
-                    String fieldName = field.substring(field.lastIndexOf("_") + 1);
-                    JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
-                    if (null == hrmFieldConf) {
-                        continue;
-                    }
-                    boolean baseField = hfm.isBaseField(fieldName);
-                    HrmFieldBean hrmFieldBean = new HrmFieldBean();
-                    hrmFieldBean.setFieldid(Util.null2String(hrmFieldConf.getString("id")));
-                    hrmFieldBean.setFieldname(scopeid + "_" + (baseField ? "hrm" : "cus") + "_" + fieldName);
-                    hrmFieldBean.setFieldlabel(hrmFieldConf.getString("fieldlabel"));
-                    hrmFieldBean.setFieldhtmltype(hrmFieldConf.getString("fieldhtmltype"));
-                    hrmFieldBean.setType(hrmFieldConf.getString("type"));
-                    hrmFieldBean.setDmlurl(hrmFieldConf.getString("dmlurl"));
-                    hrmFieldBean.setIssystem(baseField ? "1" : "0");
-                    hrmFieldBean.setIsFormField(true);
-                    hrmFieldBean.setIsQuickSearch(false);
-                    hrmFieldBean.setIsScope(false);
-                    if ("jobactivity".equals(fieldName)) {
-                        // 职务：282
-                        hrmFieldBean.setType("282");
-                    }
-                    SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user);
-                    conditionItems.add(searchConditionItem);
-                    // 如果为下拉框,添加一条空选项
-                    if (searchConditionItem.getConditionType().equals(ConditionType.SELECT)) {
-                        addEmptyForSelect(searchConditionItem);
-                    }
+                String fieldName = field.substring(field.lastIndexOf("_") + 1);
+                JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
+                if (null == hrmFieldConf) {
+                    continue;
+                }
+                boolean baseField = hfm.isBaseField(fieldName);
+                HrmFieldBean hrmFieldBean = new HrmFieldBean();
+                hrmFieldBean.setFieldid(Util.null2String(hrmFieldConf.getString("id")));
+                hrmFieldBean.setFieldname(scopeid + "_" + (baseField ? "hrm" : "cus") + "_" + fieldName);
+                hrmFieldBean.setFieldlabel(hrmFieldConf.getString("fieldlabel"));
+                hrmFieldBean.setFieldhtmltype(hrmFieldConf.getString("fieldhtmltype"));
+                hrmFieldBean.setType(hrmFieldConf.getString("type"));
+                hrmFieldBean.setDmlurl(hrmFieldConf.getString("dmlurl"));
+                hrmFieldBean.setIssystem(baseField ? "1" : "0");
+                hrmFieldBean.setIsFormField(true);
+                hrmFieldBean.setIsQuickSearch(false);
+                hrmFieldBean.setIsScope(false);
+                if ("jobactivity".equals(fieldName)) {
+                    // 职务：282
+                    hrmFieldBean.setType("282");
+                }
+                SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user);
+                conditionItems.add(searchConditionItem);
+                // 如果为下拉框,添加一条空选项
+                if (searchConditionItem.getConditionType().equals(ConditionType.SELECT)) {
+                    addEmptyForSelect(searchConditionItem);
                 }
             }
             if (CollectionUtils.isNotEmpty(conditionItems)) {
@@ -1313,7 +1235,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
             case BROWSER://浏览按钮
                 // 兼容多选浏览按钮
-                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like("," + value + ","));
+                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like(value));
                 break;
 
             case INPUTNUMBER:// 数字

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

@@ -164,10 +164,10 @@ public class JobServiceImpl extends Service implements JobService {
             // 添加父级元素
             List<JobListDTO> jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs);
             if ("asc".equalsIgnoreCase(orderType.toString())) {
-                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder)).collect(Collectors.toList());
+                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder)).collect(Collectors.toList());
 
             } else {
-                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+                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<>(user, subList, JobListDTO.class);
@@ -367,9 +367,9 @@ public class JobServiceImpl extends Service implements JobService {
         }
 
         if (StringUtils.isBlank(params.get("show_order").toString())) {
-            Double maxShowOrder = getJobMapper().getMaxShowOrder();
+            Integer maxShowOrder = getJobMapper().getMaxShowOrder();
             if (null == maxShowOrder) {
-                maxShowOrder = 0.00;
+                maxShowOrder = 0;
             }
             params.put("show_order", maxShowOrder + 1);
         }
@@ -380,7 +380,7 @@ public class JobServiceImpl extends Service implements JobService {
 
         String jobNo = (String) params.get("job_no");
         // 判断是否开启自动编号
-        jobNo = repeatDetermine(jobNo,searchParam.getEcJobTitle(),searchParam.getEcDepartment());
+        jobNo = repeatDetermine(jobNo);
         params.put("job_no", jobNo);
         return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);
     }
@@ -401,7 +401,7 @@ public class JobServiceImpl extends Service implements JobService {
             String oldJobNo = oldJobPO.getJobNo();
             String jobNo = searchParam.getJobNo();
             if (!jobNo.equals(oldJobNo)) {
-                jobNo = repeatDetermine(jobNo,searchParam.getEcJobTitle(),searchParam.getEcDepartment());
+                jobNo = repeatDetermine(jobNo);
                 params.put("job_no", jobNo);
             }
 
@@ -433,8 +433,8 @@ public class JobServiceImpl extends Service implements JobService {
         OrganizationAssert.notBlank(department, SystemEnv.getHtmlLabelName(547423,user.getLanguage()));
         int insertCount = 0;
         List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
-        Double orderNum = getJobMapper().getMaxShowOrder();
-        orderNum = null == orderNum ? 0.00 : orderNum;
+        Integer orderNum = getJobMapper().getMaxShowOrder();
+        orderNum = null == orderNum ? 0 : orderNum;
         for (Long id : idList) {
             orderNum++;
             JobPO jobById = getJobMapper().getJobById(id);
@@ -739,8 +739,7 @@ public class JobServiceImpl extends Service implements JobService {
      *
      * @return
      */
-    public String repeatDetermine(String jobNo,Integer jobTitle,Integer departmentId) {
-        JobTitlesComInfo jb = new JobTitlesComInfo();
+    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);
@@ -749,11 +748,7 @@ public class JobServiceImpl extends Service implements JobService {
             OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         } else {
             //OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), SystemEnv.getHtmlLabelName(547430,user.getLanguage()));
-            //jobNo = autoCreateCompanyNo();
-            String jobTitlescode = jb.getJobTitlescode(String.valueOf(jobTitle));
-            if (!"".equals(jobTitlescode)) {
-                jobNo = jobTitlescode+"-"+departmentId;
-            }
+            jobNo = autoCreateCompanyNo();
         }
         return jobNo;
     }

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

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

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

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

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

@@ -845,7 +845,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
             jobPO.setDescription(description);
             jobPO.setWorkDuty(work_duty);
             jobPO.setWorkAuthority(work_authority);
-            jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Double.parseDouble(show_order));
+            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);

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

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

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

@@ -222,22 +222,14 @@ public class StaffInfoImportUtil {
                                 continue nextRow;
                             }
                             for (String s : split) {
-                                List<JobPO> jobPList = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId
+                                parentJobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId
                                 ,jobactivitymark,jobgroupremark);
-                                if (jobPList.size() > 1) {
-                                    historyDetailPO.setOperateDetail(s + "岗位在岗位管理中存在重复数据，请先处理");
-                                    historyDetailPO.setStatus("0");
-                                    OrgImportUtil.saveImportDetailLog(historyDetailPO);
-                                    continue nextRow;
-                                }
-                                if (jobPList.size() == 0) {
+                                if (null == parentJobId) {
                                     historyDetailPO.setOperateDetail(s + "岗位未找到对应数据");
                                     historyDetailPO.setStatus("0");
                                     OrgImportUtil.saveImportDetailLog(historyDetailPO);
                                     continue nextRow;
                                 }
-                                parentJobId = jobPList.get(0).getId();
-
                             }
                         }
                         map.put("job_id", parentJobId);
@@ -294,7 +286,7 @@ public class StaffInfoImportUtil {
                     break;
                 case "3": // 岗位
                     if (null == parentJobId) {
-                        checkMsg = "编制维度选择岗位时，未找到对应岗位！";
+                        checkMsg = "编制维度选择岗位时，岗位必填！";
                     } else {
                         JobPO jobPO = MapperProxyFactory.getProxy(JobMapper.class).getJobById(parentJobId);
                         if (null == jobPO) {

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

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

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

@@ -36,11 +36,6 @@ public class StaffOutController {
     public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            //ESB接口user对象是null
-            if (user == null) {
-                user = new User();
-                user.setUid(1);
-            }
             return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
@@ -53,11 +48,6 @@ public class StaffOutController {
     public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            //ESB接口user对象是null
-            if (user == null) {
-                user = new User();
-                user.setUid(1);
-            }
             return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);

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

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

src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java

@@ -1,169 +0,0 @@
-package weaver.interfaces.organization.action;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.engine.organization.entity.hrmresource.po.ResourcePO;
-import com.engine.organization.entity.job.po.JobPO;
-import com.engine.organization.entity.staff.po.StaffPO;
-import com.engine.organization.enums.DeleteTypeEnum;
-import com.engine.organization.mapper.job.JobMapper;
-import com.engine.organization.mapper.staff.StaffMapper;
-import com.engine.organization.util.db.MapperProxyFactory;
-import weaver.conn.RecordSet;
-import weaver.general.Util;
-import weaver.hrm.job.JobTitlesComInfo;
-import weaver.interfaces.workflow.action.Action;
-import weaver.soa.workflow.request.RequestInfo;
-
-import java.util.*;
-
-/**
- * @Author liang.cheng
- * @Date 2024/9/25 2:03 PM
- * @Description: 流程明细编制信息操作初始化
- * @Version 1.0
- */
-public class WorkflowStaffOperateAction implements Action {
-
-    @Override
-    public String execute(RequestInfo requestInfo) {
-
-        String requestid = requestInfo.getRequestid();
-        int formid = Math.abs(requestInfo.getRequestManager().getFormid());
-
-        RecordSet rs = new RecordSet();
-
-        String mainTable = String.format("%s%s", "formtable_main_", formid);
-
-        String detaiTable = String.format("%s%s",mainTable,"_dt1");
-
-        //1.获取表单数据
-        rs.executeQuery("select a.bzfa,b.fb,b.bm,b.gw,b.bzs,b.zzs from "+mainTable+" as a \n" +
-                "right join "+detaiTable+" as b on a.id = b.mainid where a.requestid = ?",requestid);
-
-        List<StaffPO> staffList = new ArrayList<>();
-
-        while (rs.next()) {
-            StaffPO build = StaffPO.builder()
-                    .planId(Util.getIntValue(rs.getString("bzfa")))
-                    .compId(Util.getIntValue(rs.getString("fb")))
-                    .deptId(Util.getIntValue(rs.getString("bm")))
-                    .jobId(Util.getIntValue(rs.getString("gw")))
-                    .staffNum(Util.getIntValue(rs.getString("bzs")))
-                    .permanentNum(Util.getIntValue(rs.getString("zzs")))
-                    .build();
-            staffList.add(build);
-        }
-
-        if (CollectionUtil.isEmpty(staffList)) {
-            requestInfo.getRequestManager().setMessagecontent("未找到明细数据");
-            return Action.FAILURE_AND_CONTINUE;
-        }
-
-        Integer planId = staffList.get(0).getPlanId();
-
-        //2.数据处理，Ec岗位id替换为聚才林岗位id 不存在情况下新增岗位数据
-        buildJobTitle(staffList);
-
-        //3.根据方案id获取当前已有编制信息与流程明细比较；已存在的更新，未存在的新增
-        List<StaffPO> hStaffList = new ArrayList<>();
-        rs.executeQuery("select id,comp_id,dept_id,job_id,freeze_num from jcl_org_staff where plan_id = ? and delete_type = 0",planId);
-        while (rs.next()) {
-            StaffPO build = StaffPO.builder()
-                    .id((long) Util.getIntValue(rs.getString("id")))
-                    .compId(Util.getIntValue(rs.getString("comp_id")))
-                    .deptId(Util.getIntValue(rs.getString("dept_id")))
-                    .jobId(Util.getIntValue(rs.getString("job_id")))
-                    .freezeNum(Util.getIntValue(rs.getString("freeze_num")))
-                    .build();
-            hStaffList.add(build);
-        }
-
-        //新增的编制信息数据List
-        List<StaffPO> iStaffList = new ArrayList<>();
-
-        Map<String, StaffPO> hStaffMap = new HashMap<>();
-
-        for (StaffPO staff : hStaffList) {
-            String key = staff.getCompId() + "_" + staff.getDeptId() + "_" + staff.getJobId();
-            hStaffMap.put(key, staff);
-        }
-
-        for (StaffPO staff : staffList) {
-            String key = staff.getCompId() + "_" + staff.getDeptId() + "_" + staff.getJobId();
-            if (hStaffMap.containsKey(key)) {
-                StaffPO matchedStaff = hStaffMap.get(key);
-                matchedStaff.setPermanentNum(staff.getPermanentNum());
-                matchedStaff.setStaffNum(staff.getStaffNum());
-            }else {
-                iStaffList.add(staff);
-            }
-        }
-
-        //更新
-        hStaffList.forEach(item -> {
-            //todo 冻结数还原为0根据需求而定
-            buildStaffPO(item);
-            rs.executeUpdate("update jcl_org_staff set staff_num = ?,permanent_num = ?,lack_status = ? where id = ?",
-                    item.getStaffNum(),item.getPermanentNum(),item.getLackStatus(),item.getId());
-        });
-
-        //插入
-        iStaffList.forEach(staffPO -> {
-            staffPO.setFreezeNum(0);
-            staffPO.setControlPolicy(1);
-            staffPO.setDeleteType(0);
-            staffPO.setCreateTime(new Date());
-            staffPO.setUpdateTime(new Date());
-            staffPO.setCreator(1L);
-            buildStaffPO(staffPO);
-            MapperProxyFactory.getProxy(StaffMapper.class).insertIgnoreNull(staffPO);
-        });
-
-        return Action.FAILURE_AND_CONTINUE;
-    }
-
-
-    /**
-     * Ec岗位转换聚才林岗位
-     * @param staffList
-     */
-    private void buildJobTitle(List<StaffPO> staffList) {
-        JobTitlesComInfo jb = new JobTitlesComInfo();
-        staffList.forEach(item -> {
-            ResourcePO resourcePo = ResourcePO.builder().subcompanyid1(item.getCompId()).departmentid(item.getDeptId()).jobtitle(item.getJobId()).build();
-            JobPO jobByResource = MapperProxyFactory.getProxy(JobMapper.class).getJobByResource(resourcePo);
-            if (jobByResource == null) {
-                //岗位不存在新增
-                JobPO jobPO = JobPO.builder()
-                        .ecCompany(resourcePo.getSubcompanyid1())
-                        .ecDepartment(resourcePo.getDepartmentid())
-                        .ecJobTitle(resourcePo.getJobtitle())
-                        .isKey(0)
-                        .deleteType(DeleteTypeEnum.NOT_DELETED.getValue())
-                        .createTime(new Date())
-                        .updateTime(new Date())
-                        .build();
-                String jobTitlescode = jb.getJobTitlescode(String.valueOf(resourcePo.getJobtitle()));
-                if (!"".equals(jobTitlescode)) {
-                    jobPO.setJobNo(jobTitlescode+"-"+resourcePo.getDepartmentid());
-                }
-                MapperProxyFactory.getProxy(JobMapper.class).insertIgnoreNull(jobPO);
-                item.setJobId(Math.toIntExact(jobPO.getId()));
-            }else {
-                item.setJobId(Math.toIntExact(jobByResource.getId()));
-            }
-
-
-        });
-    }
-
-
-    private static void  buildStaffPO(StaffPO staffPO) {
-        List<Integer> number = Arrays.asList(staffPO.getPermanentNum(),staffPO.getFreezeNum());
-        Integer sums = number.stream()
-                .mapToInt(Integer::intValue)
-                .sum();
-        Integer a = staffPO.getStaffNum();
-        staffPO.setLackStatus((a.compareTo(sums) < 0) ? 3 : ((a.compareTo(sums) == 0) ? 2 : 1));
-    }
-}

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

@@ -1,65 +0,0 @@
-package weaver.interfaces.organization.cronjob;
-
-import com.engine.organization.entity.job.po.JobPO;
-import com.engine.organization.mapper.job.JobMapper;
-import com.engine.organization.util.db.MapperProxyFactory;
-import org.apache.commons.collections.CollectionUtils;
-import weaver.conn.RecordSet;
-import weaver.general.Util;
-import weaver.interfaces.schedule.BaseCronJob;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author liang.cheng
- * @Date 2024/10/18 11:25 AM
- * @Description: 自动清除已失效的岗位 （执行前请注意编制的引用，会出现名称为空）
- * @Version 1.0
- */
-public class DeleteIsCancelJobCrob extends BaseCronJob {
-
-    @Override
-    public void execute() {
-
-        RecordSet rs = new RecordSet();
-
-        List<JobPO> jobList = new ArrayList<>();
-        rs.executeQuery("select id,ec_jobtitle,ec_department from jcl_org_job where delete_type = 0");
-        while (rs.next()) {
-            jobList.add(JobPO.builder()
-                    .id((long)Util.getIntValue(rs.getString("id")))
-                    .ecJobTitle(Util.getIntValue(rs.getString("ec_jobtitle")))
-                    .ecDepartment(Util.getIntValue(rs.getString("ec_department")))
-                    .build());
-        }
-
-
-
-        List<Long> deleteIds = new ArrayList<>();
-
-        jobList.forEach(job -> {
-
-            //1.岗位是否封存或删除
-            rs.executeQuery("select id from hrmjobtitles where id = ? and (canceled is null or canceled != 1)",job.getEcJobTitle());
-            if (!rs.next()) {
-                deleteIds.add(job.getId());
-                return;
-            }
-
-            //2.部门是否封存或删除
-            rs.executeQuery("select id from hrmdepartment where id = ? and (canceled is null or canceled != 1)",job.getEcDepartment());
-            if (!rs.next()) {
-                deleteIds.add(job.getId());
-            }
-
-        });
-
-        if (CollectionUtils.isNotEmpty(deleteIds)) {
-            MapperProxyFactory.getProxy(JobMapper.class).deleteByIds(deleteIds);
-        }
-
-
-
-    }
-}

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

@@ -1,34 +0,0 @@
-package weaver.interfaces.organization.cronjob;
-
-import weaver.conn.RecordSet;
-import weaver.interfaces.schedule.BaseCronJob;
-
-/**
- * @Author liang.cheng
- * @Date 2024/10/10 1:56 PM
- * @Description: 定时清除组织管理Delete_type=1的数据
- * @Version 1.0
- */
-public class TableDeleteDataCron extends BaseCronJob {
-
-    @Override
-    public void execute() {
-        RecordSet rs = new RecordSet();
-
-        rs.execute("delete from jcl_org_scheme where delete_type = 1");
-        rs.execute("delete from jcl_org_level where delete_type = 1");
-        rs.execute("delete from jcl_org_grade where delete_type = 1");
-        rs.execute("delete from jcl_org_sequence where delete_type = 1");
-        rs.execute("delete from jcl_org_staffplan where delete_type = 1");
-        rs.execute("delete from jcl_org_staff where delete_type = 1");
-        rs.execute("delete from jcl_org_job where delete_type = 1");
-        rs.execute("delete from jcl_org_jobext where delete_type = 1");
-        rs.execute("delete from jcl_org_jobext_dt1 where delete_type = 1");
-        rs.execute("delete from jcl_org_detach where delete_type = 1");
-        rs.execute("delete from jcl_org_cardaccess where delete_type = 1");
-        rs.execute("delete from jcl_org_cardbutton where delete_type = 1");
-        rs.execute("delete from jcl_field_extendgroup where delete_type = 1");
-        rs.execute("delete from jcl_field_extendtitle where delete_type = 1");
-        rs.execute("delete from jcl_field_extendinfo where delete_type = 1");
-    }
-}