From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
new file mode 100644
index 0000000..ecfcb12
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="org.jeecg.modules.dnc.mapper.WorkStepMapper">
+    <select id="getByUserPerms" resultType="org.jeecg.modules.dnc.entity.WorkStep">
+        select
+               p.id
+             , p.product_id
+             , p.component_id
+             , p.parts_id
+             , p.psv_id
+             , p.PROCESS_ID
+             , p.step_name
+             , p.step_code
+             , p.CRAFT_NO
+             , p.craft_version
+             , p.step_type
+             , p.CREATE_TIME
+             , p.create_by
+             , p.UPDATE_TIME
+             , p.update_by
+             , p.description
+             , p.device_no
+             , p.assemble_no
+             , p.assemble_name
+             , (select sys_user.realname from sys_user where p.create_by=sys_user.username) as createName
+             , (select sys_user.realname from sys_user where p.update_by=sys_user.username) as updateName
+        from nc_work_step p
+                 inner join
+             (select business_id,business_type from nc_permission_stream_new where delete_flag = 0 and user_id=#{userId}) s
+             on p.id = s.business_id and s.business_type='6'
+        where p.delete_flag = 0
+    </select>
+</mapper>

--
Gitblit v1.9.3