代码提交

blade-auth/src/main/java/org/springblade/auth/AuthApplication.java

@@ -38,7 +38,7 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
  */
 @EnableRedisHttpSession
 @BladeCloudApplication
-public class AuthApplication {
+public class  AuthApplication {
 
 	public static void main(String[] args) {
 		BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args);

blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml

@@ -341,9 +341,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         GROUP_CONCAT( dt.dept_name SEPARATOR ' / ' )
         FROM
-        da_ky_sys_dept dt
+        blade_dept dt
         WHERE
-        FIND_IN_SET( dt.dept_id, d.ancestors )),
+        FIND_IN_SET( dt.id, d.ancestors )),
         ' / ',
         d.dept_name
         ))) AS deptName,
@@ -363,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		dkta.del_flag AS delFlag
 		FROM da_ky_transfer_apply dkta
 		left join da_ky_project dkp on dkta.pro_id = dkp.id
-		LEFT JOIN da_ky_sys_dept d ON dkta.dept_id = d.dept_id AND d.del_flag = '0'
+		LEFT JOIN blade_dept d ON dkta.dept_id = d.id AND d.is_deleted = '0'
 		where dkta.del_flag = '1'
 		<if test="userId != null and userId != ''">
 			and dkta.create_user_id = #{userId}
@@ -397,24 +397,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getTransferApply" resultType="org.springblade.system.domain.TransferApplyDto">
 		WITH RECURSIVE DeptTree AS (
 			SELECT
-				dept_id,
+				id,
 				dept_name,
 				parent_id,
 				dept_name AS full_path,
 				0 AS level
-			FROM da_ky_sys_dept
+			FROM blade_dept
-			WHERE dept_id = (SELECT dept_id FROM da_ky_transfer_apply WHERE id = #{id})
+			WHERE id = (SELECT dept_id FROM da_ky_transfer_apply WHERE id = #{id})
 
 			UNION ALL
 
 			SELECT
-				d.dept_id,
+				d.id,
 				d.dept_name,
 				d.parent_id,
 				CONCAT(d.dept_name, ' / ', dt.full_path) AS full_path,
 				dt.level + 1
-			FROM da_ky_sys_dept d
+			FROM blade_dept d
-					 INNER JOIN DeptTree dt ON d.dept_id = dt.parent_id
+					 INNER JOIN DeptTree dt ON d.id = dt.parent_id
 		)
 		SELECT
 			dt.full_path AS deptName,
@@ -639,13 +639,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getDeptList" resultType="java.lang.String">
 		SELECT
-			dept_id
+			id
 		FROM
-			da_ky_sys_dept
+            blade_dept
 		WHERE
-			del_flag = '0'
+            is_deleted = '0'
 		  AND (
-			dept_id = #{deptId}
+			id = #{deptId}
 		  OR FIND_IN_SET( #{deptId}, ancestors )
 			)
 	</select>

blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferProblemMapper.xml

@@ -69,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         GROUP_CONCAT( dt.dept_name SEPARATOR ' / ' )
         FROM
-        da_ky_sys_dept dt
+        blade_dept dt
         WHERE
-        FIND_IN_SET( dt.dept_id, d.ancestors )),
+        FIND_IN_SET( dt.id, d.ancestors )),
         ' / ',
         d.dept_name
         ))) AS deptName,
@@ -86,11 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM
 			da_ky_transfer_issue dkti
 		left join da_ky_project dkp ON dkti.pro_id = dkp.id
-		LEFT JOIN da_ky_sys_dept d ON dkti.dept_id = d.dept_id AND d.del_flag = '0'
+		LEFT JOIN blade_dept d ON dkti.dept_id = d.id AND d.is_deleted = '0'
 		WHERE
 		dkti.del_flag = '1'
-		<if test="proName != null and proName != ''">
+		<if test="singleProName != null and singleProName != ''">
-			AND dkti.single_pro_name = #{proName}
+			AND dkti.single_pro_name like concat('%', #{singleProName}, '%')
 		</if>
 		<if test="proType != null and proType != ''">
 			and dkp.pro_type = #{proType}