Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessGroupMapper.xml

@@ -0,0 +1,23 @@
+<?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="com.cf.imes.module.system.dal.mysql.process.ProcessGroupMapper">
+
+    <select id="selectOneById" resultType="com.cf.imes.module.system.dal.dataobject.process.ProcessGroupDO">
+        select
+            p.id,
+            p.organ_id,
+            p.name,
+            p.is_default,
+            p.sort,
+            p.items,
+            p.description,
+            p.creator,
+            p.create_time,
+            p.updater,
+            p.update_time,
+            p.deleted
+        from process_group p
+        where p.id = #{id} and p.organ_id = #{organId} and p.deleted = 0
+    </select>
+
+</mapper>

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessMapper.xml

@@ -24,7 +24,7 @@
         p.deleted
         from process p
         <where>
-
+            p.deleted = 0
             <if test="page.userId != null and page.userId != '' ">
                 and p.id in (select process_id from process_user where user_id = #{page.userId})
             </if>
@@ -42,4 +42,29 @@
             </if>
         </where>
     </select>
+
+    <select id="selectOneById" resultType="com.cf.imes.module.system.dal.dataobject.process.ProcessDO">
+        select
+            p.id,
+            p.organ_id,
+            p.name,
+            p.piece_rate,
+            p.piece_type,
+            p.type,
+            p.is_custom,
+            p.is_dealer,
+            p.hour_capacity,
+            p.sort,
+            p.unit,
+            p.is_enabled,
+            p.prepare_time,
+            p.description,
+            p.creator,
+            p.create_time,
+            p.updater,
+            p.update_time,
+            p.deleted
+        from process p
+        where p.id = #{id} and p.organ_id = #{organId} and p.deleted = 0
+    </select>
 </mapper>

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessUserMapper.xml

@@ -2,15 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cf.imes.module.system.dal.mysql.process.ProcessUserMapper">
 
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.cf.com/MyBatis/x-plugins/
-     -->
     <delete id="deleteUserByProcessId" parameterType="Long">
         DELETE FROM process_user
         WHERE process_id = #{processId};
     </delete>
 
+    <select id="selectOneById" resultType="com.cf.imes.module.system.dal.dataobject.process.ProcessUserDO">
+        select
+            p.organ_id,
+            p.process_id,
+            p.user_id,
+        from process_user p
+        where p.organ_id = #{organId} and p.process_id = #{processId} and p.deleted = 0
+    </select>
 </mapper>