From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
cnas-server/src/main/resources/mapper/DepartmentMapper.xml | 49 +++++++++++++++----------------------------------
1 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
index d29cd93..463e3ba 100644
--- a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
@@ -1,43 +1,24 @@
<?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.yuanchu.mom.mapper.DepartmentMapper">
- <select id="selectDepartment" resultType="com.yuanchu.mom.pojo.Department">
- WITH RECURSIVE DepartmentHierarchy AS (
- SELECT id, name, father_id
- FROM department
- WHERE father_id IS NULL
-
- UNION ALL
-
- SELECT d.id, d.name, d.father_id
- FROM department d
- JOIN DepartmentHierarchy dh ON d.father_id = dh.id
- )
+ <select id="selectDepartment" resultType="com.yuanchu.mom.dto.DepartmentDto">
SELECT id, name, father_id
- FROM DepartmentHierarchy;
+ FROM department
</select>
- <select id="showUserById" resultType="com.yuanchu.mom.dto.UserDto">
- select * from (select id, name, age, email, phone,depart_id
- from user where state=1 and SUBSTRING_INDEX(depart_id, ',', -1) in
- <foreach collection="ids" item="id" separator="," open="(" close=")">
- #{id}
- </foreach> ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
+
<select id="selectSonById" resultType="java.lang.Integer">
- WITH RECURSIVE DepartmentHierarchy AS (
- SELECT id, name, father_id
- FROM department
- WHERE id = #{id}
- UNION ALL
- SELECT d.id, d.name, d.father_id
- FROM department d
- JOIN DepartmentHierarchy dh ON d.father_id = dh.id
- )
+ SELECT au.id
+ FROM (SELECT * FROM department WHERE father_id IS NOT NULL) au,
+ (SELECT @father_id := #{id}) pd
+ WHERE FIND_IN_SET(father_id, @father_id) > 0
+ AND @father_id := concat(@father_id, ',', id)
+ UNION
SELECT id
- FROM DepartmentHierarchy
- order by id desc;
+ FROM department
+ WHERE id = #{id}
+ ORDER BY id
+ </select>
+ <select id="selectCustomList" resultType="com.yuanchu.mom.dto.DepartmentDto">
+ select id, name, category fatherId from role;
</select>
</mapper>
--
Gitblit v1.9.3