From e1629a021e034fea8610ece632f1ce537617ad86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 21 Jun 2022 15:08:23 +0800
Subject: [PATCH] =?UTF-8?q?oracle=E9=94=99=E8=AF=AF=E5=92=8C=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sql/调整系统薪资项目.sql             |  0
 .../salarysob/SalarySobItemGroupMapper.xml    | 77 +------------------
 .../wrapper/SalaryArchiveItemWrapper.java     |  2 -
 3 files changed, 1 insertion(+), 78 deletions(-)
 create mode 100644 resource/sql/调整系统薪资项目.sql

diff --git a/resource/sql/调整系统薪资项目.sql b/resource/sql/调整系统薪资项目.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml
index 2f8118d1b..79bd2c11c 100644
--- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml
+++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.xml
@@ -94,82 +94,7 @@
 
 
     <!-- 插入不为NULL的字段 -->
-    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO"
-            keyProperty="id" keyColumn="id" useGeneratedKeys="true"
-    >
-        INSERT INTO hrsa_salary_sob_item_group
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-
-            <if test="id != null">
-                id,
-            </if>
-            <if test="salarySobId != null">
-                salary_sob_id,
-            </if>
-            <if test="name != null">
-                name,
-            </if>
-            <if test="sortedIndex != null">
-                sorted_index,
-            </if>
-            <if test="description != null">
-                description,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="updateTime != null">
-                update_time,
-            </if>
-            <if test="creator != null">
-                creator,
-            </if>
-            <if test="deleteType != null">
-                delete_type,
-            </if>
-            <if test="tenantKey != null">
-                tenant_key,
-            </if>
-        </trim>
-        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id},
-            </if>
-            <if test="salarySobId != null">
-                #{salarySobId},
-            </if>
-            <if test="name != null">
-                #{name},
-            </if>
-            <if test="sortedIndex != null">
-                #{sortedIndex},
-            </if>
-            <if test="description != null">
-                #{description},
-            </if>
-            <if test="createTime != null">
-                #{createTime},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime},
-            </if>
-            <if test="creator != null">
-                #{creator},
-            </if>
-            <if test="deleteType != null">
-                #{deleteType},
-            </if>
-            <if test="tenantKey != null">
-                #{tenantKey},
-            </if>
-        </trim>
-    </insert>
-
-    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO" databaseId="oracle"
-    >
-        <selectKey  keyProperty="id" resultType="long" order="AFTER">
-            select hrsa_salary_sob_item_group_id.currval from dual
-        </selectKey>
+    <insert id="insertIgnoreNull" parameterType="com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO">
         INSERT INTO hrsa_salary_sob_item_group
         <trim prefix="(" suffix=")" suffixOverrides=",">
 
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
index 8eddb320c..9e2e3462b 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
@@ -2,7 +2,6 @@ package com.engine.salary.wrapper;
 
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
-import com.engine.salary.encrypt.archive.SalaryItemAdjustRecordListDTOEncrypt;
 import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveItemFormDTO;
 import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO;
 import com.engine.salary.entity.salaryarchive.dto.SingleSalaryItemAdjustRecordListDTO;
@@ -227,7 +226,6 @@ public class SalaryArchiveItemWrapper extends Service {
         //所有调整记录
         List<SalaryItemAdjustRecordListDTO> listAll = getSalaryArchiveItemService(user).salaryItemAdjustRecordList(SalaryItemAdjustRecordQueryParam.builder().build(), salaryItemIds);
 
-        SalaryItemAdjustRecordListDTOEncrypt.decryptSalaryItemAdjustRecordListDTOList(listAll);
         //操作记录
         //根据条件分页查询调整记录
         PageInfo<SalaryItemAdjustRecordListDTO> adjustlistByParamPage = getSalaryArchiveItemService(user).salaryItemAdjustRecordListPage(adjustRecordQueryParam, salaryItemIds);