修改sql函数

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsBlacklistController.java

@@ -2,6 +2,7 @@ package com.ktg.iscs.controller;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ktg.common.annotation.Log;
 import com.ktg.common.core.controller.BaseController;
@@ -79,6 +80,7 @@ public class IsBlacklistController extends BaseController
     {
         Assert.notBlank(recordIds, "请选择需要删除的数据!");
         Long[] longIds = Convert.toLongArray(recordIds);
-        return CommonResult.success(isBlacklistService.removeBatchByIds(Arrays.asList(longIds)));
+        return CommonResult.success(isBlacklistService.remove(Wrappers.<IsBlacklist>lambdaQuery()
+                .in(IsBlacklist::getRecordId, Arrays.asList(longIds))));
     }
 }

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsBlacklist.java

@@ -22,7 +22,6 @@ public class IsBlacklist extends BaseBean
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "记录D")
-    @TableId(type = IdType.AUTO)
     private Long recordId;
 
     @ApiModelProperty(value = "用户ID")

ktg-iscs/src/main/resources/mapper/IsBlacklistMapper.xml

@@ -18,6 +18,7 @@
                 and b.user_id = #{isBlacklist.userId}
             </if>
         </where>
+        order by b.record_id desc
     </select>
     <select id="getWhiteUserPage" resultType="com.ktg.iscs.domain.vo.user.WhiteUserVO">
         SELECT

ktg-iscs/src/main/resources/mapper/IsJobTicketLockMapper.xml

@@ -131,9 +131,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         is_job_ticket_lock t left join is_job_ticket t1 on t1.ticket_id = t.ticket_id
         <where>
-            t.lock_status != "5"
-            and t1.ticket_status != "5"
-            and t1.ticket_status != "6"
+            t.lock_status != '5'
+            and t1.ticket_status != '5'
+            and t1.ticket_status != '6'
             <if test="lockId != null">
                 AND t.lock_id = #{lockId}
             </if>

ktg-iscs/src/main/resources/mapper/IsJobTicketMapper.xml

@@ -139,10 +139,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 如果LEFT JOIN is_job_ticket_user需要正确的pointCount，需要改写成子查询，现在用不到正确的pointCount，效率优先 -->
     <select id="getIsJobTicketPage" resultType="com.ktg.iscs.domain.vo.ticket.PageTicketVO">
+        select t.* from (
         SELECT
-        j.*,
-        ws.workstation_name,
-        m.machinery_name,
+        j.ticket_id,
+        j.ticket_code,
+        j.ticket_name,
+        j.workshop_id,
+        j.workarea_id,
+        j.sop_id,
+        j.ticket_type,
+        j.ticket_content,
+        j.ticket_status,
+        j.ticket_start_time,
+        j.ticket_end_time,
+        j.del_flag,
+        j.create_by,
+        j.create_time,
+        j.update_time,
+        j.update_by,
+        j.workstation_id,
+        j.machinery_id,
+        max(ws.workstation_name) as workstation_name,
+        max(m.machinery_name) as machinery_name,
         COUNT( p.record_id ) AS pointCount
         FROM
         is_job_ticket j
@@ -181,7 +199,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and u.user_id = #{dto.userId}
             </if>
         </where>
-        GROUP BY j.ticket_id
+        GROUP BY j.ticket_id,
+        j.ticket_code,
+        j.ticket_name,
+        j.workshop_id,
+        j.workarea_id,
+        j.sop_id,
+        j.ticket_type,
+        j.ticket_content,
+        j.ticket_status,
+        j.ticket_start_time,
+        j.ticket_end_time,
+        j.del_flag,
+        j.create_by,
+        j.create_time,
+        j.update_time,
+        j.update_by,
+        j.workstation_id,
+        j.machinery_id) t
         ORDER BY j.ticket_id DESC
     </select>
     <select id="getMonitorJobTicketPage" resultType="com.ktg.iscs.domain.vo.ticket.MonitorTicketPageVO">
@@ -193,7 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join is_machinery m ON m.machinery_id = j.machinery_id
         <where>
             <!-- (j.ticket_status != 4 OR ( j.ticket_end_time > CURDATE() AND j.ticket_status = 4 )) -->
-            (j.ticket_status &lt; 5 OR ( j.ticket_end_time > CURDATE() AND j.ticket_status = 5 ))
+            (j.ticket_status &lt; 5 OR ( j.ticket_end_time > GETDATE() AND j.ticket_status = 5 ))
             <if test="dto.ticketCode != null and dto.ticketCode.trim != ''">
                 and j.ticket_code like concat('%',#{dto.ticketCode},'%')
             </if>

ktg-iscs/src/main/resources/mapper/IsJobTicketPointsMapper.xml

@@ -144,8 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             is_job_ticket_points p
                 LEFT JOIN is_job_ticket t ON t.ticket_id = p.ticket_id
         WHERE
-            t.ticket_status = "5"
-          AND p.point_status = "1"
+            t.ticket_status = '5'
+          AND p.point_status = '1'
           AND p.unlocked_by_key_id IS NULL
           AND p.point_id = #{pointId}
           AND p.lock_id = #{lockId}
@@ -156,10 +156,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             is_job_ticket_points p
                 LEFT JOIN is_job_ticket t ON t.ticket_id = p.ticket_id
-                LEFT JOIN is_job_ticket_key k ON k.ticket_id = p.ticket_id and k.ticket_type = "1"
+                LEFT JOIN is_job_ticket_key k ON k.ticket_id = p.ticket_id and k.ticket_type = '1'
         WHERE
             t.ticket_status < 5
-          AND p.point_status = "1"
+          AND p.point_status = '1'
           AND p.unlocked_by_key_id IS NULL
           AND p.point_id = #{pointId}
           AND p.lock_id = #{lockId}
@@ -172,10 +172,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             is_job_ticket_points p
                 LEFT JOIN is_job_ticket t ON t.ticket_id = p.ticket_id
-                LEFT JOIN is_job_ticket_key k ON k.ticket_id = p.ticket_id and k.ticket_type = "1"
+                LEFT JOIN is_job_ticket_key k ON k.ticket_id = p.ticket_id and k.ticket_type = '1'
         WHERE
             t.ticket_status < 5
-          AND p.point_status = "1"
+          AND p.point_status = '1'
           AND p.unlocked_by_key_id IS NULL
           AND p.point_id = #{pointId}
           AND k.collect_time IS NULL
@@ -188,10 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             is_job_ticket_points p
                 LEFT JOIN is_job_ticket t ON t.ticket_id = p.ticket_id
-                LEFT JOIN is_job_ticket_key k ON k.ticket_id = p.ticket_id and k.ticket_type = "1"
+                LEFT JOIN is_job_ticket_key k ON k.ticket_id = p.ticket_id and k.ticket_type = '1'
         WHERE
             t.ticket_status < 5
-          AND p.point_status = "1"
+          AND p.point_status = '1'
           AND p.unlocked_by_key_id IS NULL
           AND p.point_id = #{pointId}
           AND p.lock_id = #{lockId}

ktg-iscs/src/main/resources/mapper/IsJobTicketUserMapper.xml

@@ -109,8 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             u.user_id = #{userId}
           AND u.user_role = "jtlocker"
-          AND t.ticket_status != "5"
-          AND t.ticket_status != "6"
+          AND t.ticket_status != '5'
+          AND t.ticket_status != '6'
     </select>
 
 

ktg-iscs/src/main/resources/mapper/IsMapPointMapper.xml

@@ -35,29 +35,29 @@
         m.name as map_name,
 
         CASE
-        WHEN p.map_type = "1"THEN
+        WHEN p.map_type = '1' THEN
         w.workstation_name
-        WHEN p.map_type = "2" or p.map_type = "3" THEN
+        WHEN p.map_type = '2' or p.map_type = '3' THEN
         ip.point_name
         END AS entity_name,
 
         CASE
-        WHEN p.map_type = "2" or p.map_type = "3" THEN
+        WHEN p.map_type = '2' or p.map_type = '3' THEN
         ip.point_icon
         END AS point_icon,
 
         CASE
-        WHEN p.map_type = "2" or p.map_type = "3" THEN
+        WHEN p.map_type = '2' or p.map_type = '3' THEN
         ip.point_picture
         END AS point_picture,
 
         CASE
-        WHEN p.map_type = "2" or p.map_type = "3" THEN
+        WHEN p.map_type = '2' or p.map_type = '3' THEN
         r.rfid
         END AS point_nfc,
 
         CASE
-        WHEN p.map_type = "2" or p.map_type = "3" THEN
+        WHEN p.map_type = '2' or p.map_type = '3' THEN
         ip.point_serial_number
         END AS point_serial_number
 

ktg-iscs/src/main/resources/mapper/IsMaterialsMapper.xml

@@ -239,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             is_materials m
                 LEFT JOIN is_materials_type t ON t.materials_type_id = m.materials_type_id
-        where m.materials_cabinet_id = #{cabinetId} and m.loan_state = "1"
+        where m.materials_cabinet_id = #{cabinetId} and m.loan_state = '1'
     </select>
     <select id="getMaterialListByRfid" resultType="com.ktg.iscs.domain.IsMaterials">
         SELECT

ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkCodeUnique" parameterType="DvRepair" resultMap="DvRepairResult">
         <include refid="selectDvRepairVo"/>
-        where repair_code = #{repairCode} offset 0 rows fetch next 1 rows only
+        where repair_code = #{repairCode} order by repair_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertDvRepair" parameterType="DvRepair" useGeneratedKeys="true" keyProperty="repairId">

ktg-mes/src/main/resources/mapper/md/ItemTypeMapper.xml

@@ -68,7 +68,7 @@
 
     <select id="hasItemByItemTypeId" parameterType="Long" resultType="int">
         select count(1) from md_item
-        where item_type_id = #{itemTypeId} offset 0 rows fetch next 1 rows only
+        where item_type_id = #{itemTypeId} order by item_type_id desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="selectChildrenItemTypeById" parameterType="Long" resultMap="ItemTypeResult">

ktg-mes/src/main/resources/mapper/md/MdItemMapper.xml

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="checkItemNameUnique" parameterType="MdItem" resultMap="MdItemResult">
 		<include refid="selectMdItemVo"/>
-		where item_code = #{itemName} offset 0 rows fetch next 1 rows only
+		where item_code = #{itemName} order by item_code desc offset 0 rows fetch next 1 rows only
 	</select>
 
 	<insert id="insertMdItem" parameterType="MdItem" useGeneratedKeys="true" keyProperty="itemId">

ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkWorkshopCodeUnique" parameterType="MdWorkshop" resultMap="MdWorkshopResult">
         <include refid="selectMdWorkshopVo"/>
-        where workshop_code = #{workshopCode} offset 0 rows fetch next 1 rows only
+        where workshop_code = #{workshopCode} order by workshop_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkWorkshopNameUnique" parameterType="MdWorkshop" resultMap="MdWorkshopResult">

ktg-mes/src/main/resources/mapper/md/MdWorkstationMachineMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkMachineryExists" parameterType="MdWorkstationMachine" resultMap="MdWorkstationMachineResult">
         <include refid="selectMdWorkstationMachineVo"/>
-        where machinery_code = #{machineryCode} offset 0 rows fetch next 1 rows only
+        where machinery_code = #{machineryCode} order by machinery_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertMdWorkstationMachine" parameterType="MdWorkstationMachine" useGeneratedKeys="true" keyProperty="recordId">

ktg-mes/src/main/resources/mapper/md/MdWorkstationMapper.xml

@@ -72,12 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkWorkStationCodeUnique" parameterType="MdWorkstation" resultMap="MdWorkstationResult">
         <include refid="selectMdWorkstationVo"/>
-        where workstation_code = #{workstationCode} offset 0 rows fetch next 1 rows only
+        where workstation_code = #{workstationCode} order by workstation_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkWorkStationNameUnique" parameterType="MdWorkstation" resultMap="MdWorkstationResult">
         <include refid="selectMdWorkstationVo"/>
-        where workstation_name = #{workstationName} offset 0 rows fetch next 1 rows only
+        where workstation_name = #{workstationName} order by workstation_name desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertMdWorkstation" parameterType="MdWorkstation" useGeneratedKeys="true" keyProperty="workstationId">

ktg-mes/src/main/resources/mapper/md/MdWorkstationToolMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkToolTypeExists" parameterType="MdWorkstationTool" resultMap="MdWorkstationToolResult">
         <include refid="selectMdWorkstationToolVo"/>
-        where tool_type_id = #{toolTypeId} and workstation_id = #{workstationId} offset 0 rows fetch next 1 rows only
+        where tool_type_id = #{toolTypeId} and workstation_id = #{workstationId} order by tool_type_id desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertMdWorkstationTool" parameterType="MdWorkstationTool" useGeneratedKeys="true" keyProperty="recordId">

ktg-mes/src/main/resources/mapper/md/MdWorkstationWorkerMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkPostExist" parameterType="MdWorkstationWorker" resultMap="MdWorkstationWorkerResult">
         <include refid="selectMdWorkstationWorkerVo"/>
-        where post_code = #{postCode} and workstation_id = #{workstationId} offset 0 rows fetch next 1 rows only
+        where post_code = #{postCode} and workstation_id = #{workstationId} order by post_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertMdWorkstationWorker" parameterType="MdWorkstationWorker" useGeneratedKeys="true" keyProperty="recordId">

ktg-mes/src/main/resources/mapper/pro/ProProcessMapper.xml

@@ -43,12 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="checkProcessCodeUnique" parameterType="ProProcess" resultMap="ProProcessResult">
         <include refid="selectProProcessVo"/>
-        where process_code = #{processCode} offset 0 rows fetch next 1 rows only
+        where process_code = #{processCode} order by process_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkProcessNameUnique" parameterType="ProProcess" resultMap="ProProcessResult">
         <include refid="selectProProcessVo"/>
-        where process_name = #{processName} offset 0 rows fetch next 1 rows only
+        where process_name = #{processName} order by process_name desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertProProcess" parameterType="ProProcess" useGeneratedKeys="true" keyProperty="processId">

ktg-mes/src/main/resources/mapper/pro/ProRouteMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkRouteCodeUnique" parameterType="ProRoute" resultMap="ProRouteResult">
         <include refid="selectProRouteVo"/>
-        where route_code = #{routeCode} offset 0 rows fetch next 1 rows only
+        where route_code = #{routeCode} order by route_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertProRoute" parameterType="ProRoute" useGeneratedKeys="true" keyProperty="routeId">

ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml

@@ -64,17 +64,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkOrderNumExists" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
         <include refid="selectProRouteProcessVo"/>
-        where route_id = #{routeId} and order_num = #{orderNum} offset 0 rows fetch next 1 rows only
+        where route_id = #{routeId} and order_num = #{orderNum} order by route_id desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkProcessExists" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
         <include refid="selectProRouteProcessVo"/>
-        where route_id = #{routeId} and process_id = #{processId} offset 0 rows fetch next 1 rows only
+        where route_id = #{routeId} and process_id = #{processId} order by route_id desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkUpdateFlagUnique" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
         <include refid="selectProRouteProcessVo"/>
-        where route_id = #{routeId} and key_flag = 'Y' offset 0 rows fetch next 1 rows only
+        where route_id = #{routeId} and key_flag = 'Y' order by route_id desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="findPreProcess" parameterType="ProRouteProcess" resultMap="ProRouteProcessResult">
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND order_num &lt; (
                     SELECT order_num
                     FROM pro_route_process
-                    WHERE route_id = #{routeId} offset 0 rows fetch next 1 rows only
+                    WHERE route_id = #{routeId} order by route_id desc offset 0 rows fetch next 1 rows only
                 )
             </otherwise>
         </choose>
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND order_num &gt; (
                 SELECT order_num
                 FROM pro_route_process
-                WHERE route_id = #{routeId} offset 0 rows fetch next 1 rows only
+                WHERE route_id = #{routeId} order by route_id desc offset 0 rows fetch next 1 rows only
                 )
             </otherwise>
         </choose>

ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkItemUnique" parameterType="ProRouteProduct" resultMap="ProRouteProductResult">
         <include refid="selectProRouteProductVo"/>
-        where item_id = #{itemId} offset 0 rows fetch next 1 rows only
+        where item_id = #{itemId} order by item_id desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertProRouteProduct" parameterType="ProRouteProduct" useGeneratedKeys="true" keyProperty="recordId">

ktg-mes/src/main/resources/mapper/pro/ProTaskIssueMapper.xml

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and task_id = #{taskId}
         and source_doc_type = #{sourceDocType}
         and source_line_id = #{sourceLineId}
+        order by workstation_id desc
         offset 0 rows fetch next 1 rows only
     </select>
 

ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml

@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkWorkorderCodeUnique" parameterType="ProWorkorder" resultMap="ProWorkorderResult">
         <include refid="selectProWorkorderVo"/>
-        where workorder_code = #{workorderCode} offset 0 rows fetch next 1 rows only
+        where workorder_code = #{workorderCode} order by workorder_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertProWorkorder" parameterType="ProWorkorder" useGeneratedKeys="true" keyProperty="workorderId">

ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml

@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkIqcCodeUnique" parameterType="QcIqc" resultMap="QcIqcResult">
         <include refid="selectQcIqcVo"/>
-        where iqc_code = #{iqcCode} offset 0 rows fetch next 1 rows only
+        where iqc_code = #{iqcCode} order by iqc_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertQcIqc" parameterType="QcIqc" useGeneratedKeys="true" keyProperty="iqcId">

ktg-mes/src/main/resources/mapper/qc/QcTemplateMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from qc_template t
         left join qc_template_product tl on t.template_id = tl.template_id
         where t.qc_types like concat('%',#{qcTypes},'%') and tl.item_id = #{itemId}
+        order by t.template_id desc
         offset 0 rows fetch next 1 rows only;
     </select>
 
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                             on t.template_id = p.template_id
         where p.item_id = #{itemId}
           and t.qc_types like concat('%',#{qcType},'%')
+        order by p.item_id desc
         offset 0 rows fetch next 1 rows only
     </select>
 

ktg-mes/src/main/resources/mapper/tm/TmToolMapper.xml

@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="checkToolCodeUnique" parameterType="TmTool" resultMap="TmToolResult">
         <include refid="selectTmToolVo"/>
-        where tool_code = #{toolCode} offset 0 rows fetch next 1 rows only
+        where tool_code = #{toolCode} order by tool_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertTmTool" parameterType="TmTool" useGeneratedKeys="true" keyProperty="toolId">

ktg-mes/src/main/resources/mapper/tm/TmToolTypeMapper.xml

@@ -44,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkToolTypeCodeUnique" parameterType="TmToolType" resultMap="TmToolTypeResult">
         <include refid="selectTmToolTypeVo"/>
-        where tool_type_code = #{toolTypeCode} offset 0 rows fetch next 1 rows only
+        where tool_type_code = #{toolTypeCode} order by tool_type_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkToolTypeNameUnique" parameterType="TmToolType" resultMap="TmToolTypeResult">
         <include refid="selectTmToolTypeVo"/>
-        where tool_type_name = #{toolTypeName} offset 0 rows fetch next 1 rows only
+        where tool_type_name = #{toolTypeName} order by tool_type_name desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertTmToolType" parameterType="TmToolType" useGeneratedKeys="true" keyProperty="toolTypeId">

ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml

@@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkIssueCodeUnique" parameterType="WmIssueHeader" resultMap="WmIssueHeaderResult">
         <include refid="selectWmIssueHeaderVo"/>
-        where issue_code = #{issueCode} offset 0 rows fetch next 1 rows only
+        where issue_code = #{issueCode} order by issue_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="getTxBeans" parameterType="Long" resultMap="IssueTxBeanResult">

ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml

@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workorderId !=null">and workorder_id = #{workorderId}</if>
             <if test="workorderCode !=null">and workorder_code = #{workorderCode}</if>
         </where>
-        and 1=1 offset 0 rows fetch next 1 rows only
+        and 1=1 order by item_id desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertWmMaterialStock" parameterType="WmMaterialStock" useGeneratedKeys="true" keyProperty="materialStockId">

ktg-mes/src/main/resources/mapper/wm/WmStorageLocationMapper.xml

@@ -45,12 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWmStorageLocationByLocationCode" parameterType="String" resultMap="WmStorageLocationResult">
         <include refid="selectWmStorageLocationVo"/>
-        where location_code = #{locationCode} offset 0 rows fetch next 1 rows only
+        where location_code = #{locationCode} order by location_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkLocationCodeUnique" parameterType="WmStorageLocation" resultMap="WmStorageLocationResult">
         <include refid="selectWmStorageLocationVo"/>
-        where location_code = #{locationCode} and warehouse_id = #{warehouseId} offset 0 rows fetch next 1 rows only
+        where location_code = #{locationCode} and warehouse_id = #{warehouseId} order by location_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkLocationNameUnique" parameterType="WmStorageLocation" resultMap="WmStorageLocationResult">

ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml

@@ -78,17 +78,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWmWarehouseByWarehouseCode" parameterType="String" resultMap="WmWarehouseResult">
         <include refid="selectWmWarehouseVo"/>
-        where warehouse_code = #{warehouseCode} offset 0 rows fetch next 1 rows only
+        where warehouse_code = #{warehouseCode} order by warehouse_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkWarehouseCodeUnique" parameterType="WmWarehouse" resultMap="WmWarehouseResult">
         <include refid="selectWmWarehouseVo"/>
-        where warehouse_code = #{warehouseCode} offset 0 rows fetch next 1 rows only
+        where warehouse_code = #{warehouseCode} order by warehouse_code desc offset 0 rows fetch next 1 rows only
     </select>
 
     <select id="checkWarehouseNameUnique" parameterType="WmWarehouse" resultMap="WmWarehouseResult">
         <include refid="selectWmWarehouseVo"/>
-        where warehouse_name = #{warehouseName} offset 0 rows fetch next 1 rows only
+        where warehouse_name = #{warehouseName} order by warehouse_name desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertWmWarehouse" parameterType="WmWarehouse" useGeneratedKeys="true" keyProperty="warehouseId">

ktg-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
         <include refid="selectConfigVo"/>
-        where config_key = #{configKey} offset 0 rows fetch next 1 rows only
+        where config_key = #{configKey} order by config_key desc offset 0 rows fetch next 1 rows only
     </select>
 
     <insert id="insertConfig" parameterType="SysConfig">

ktg-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -69,20 +69,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
 		select count(1) from sys_dept
-		where del_flag = '0' and parent_id = #{deptId} offset 0 rows fetch next 1 rows only
+		where del_flag = '0' and parent_id = #{deptId} order by parent_id desc offset 0 rows fetch next 1 rows only
 	</select>
 
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where find_in_set(#{deptId}, ancestors)
+		select * from sys_dept where CHARINDEX(',' + CAST(#{deptId} AS VARCHAR) + ',', ',' + ancestors + ',') > 0
 	</select>
 
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+		select count(*) from sys_dept where status = 0 and del_flag = '0' and CHARINDEX(',' + CAST(#{deptId} AS VARCHAR) + ',', ',' + ancestors + ',') > 0
 	</select>
 
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	    <include refid="selectDeptVo"/>
-		where dept_name=#{deptName} and parent_id = #{parentId} offset 0 rows fetch next 1 rows only
+		where dept_name=#{deptName} and parent_id = #{parentId} order by dept_name desc offset 0 rows fetch next 1 rows only
 	</select>
 
     <insert id="insertDept" parameterType="SysDept">

ktg-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
-		where dict_type = #{dictType} offset 0 rows fetch next 1 rows only
+		where dict_type = #{dictType} order by dict_type desc offset 0 rows fetch next 1 rows only
 	</select>
 
 	<delete id="deleteDictTypeById" parameterType="Long">

ktg-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -122,7 +122,7 @@
 
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
-		where menu_name=#{menuName} and parent_id = #{parentId} offset 0 rows fetch next 1 rows only
+		where menu_name=#{menuName} and parent_id = #{parentId} order by menu_name desc offset 0 rows fetch next 1 rows only
 	</select>
 
 	<update id="updateMenu" parameterType="SysMenu">

ktg-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -64,12 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
-		 where post_name=#{postName} offset 0 rows fetch next 1 rows only
+		 where post_name=#{postName} order by post_name desc offset 0 rows fetch next 1 rows only
 	</select>
 
 	<select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
-		 where post_code=#{postCode} offset 0 rows fetch next 1 rows only
+		 where post_code=#{postCode} order by post_code desc offset 0 rows fetch next 1 rows only
 	</select>
 
 	<update id="updatePost" parameterType="SysPost">