Ver Fonte

解决sql解析错误

caixiaofeng há 10 meses atrás
pai
commit
4618c2d28e

+ 2 - 2
flow-app/src/main/resources/application-dev.yml

@@ -91,9 +91,9 @@ flowable:
   dmn:
     enabled: false
   cmmn:
-    enabled: true
+    enabled: false
   idm:
-    enabled: true
+    enabled: false
 
   # 默认邮箱配置
   mail:

+ 2 - 2
flow-app/src/main/resources/application-test.yml

@@ -93,9 +93,9 @@ flowable:
   dmn:
     enabled: false
   cmmn:
-    enabled: true
+    enabled: false
   idm:
-    enabled: true
+    enabled: false
 
   # 默认邮箱配置
   mail:

+ 16 - 16
flow-system/flow-system-biz/src/main/java/com/flow/dao/DeptDao.java

@@ -16,10 +16,10 @@ public interface DeptDao extends BaseDao<Dept> {
 
     @Select({
             "<script>",
-            "select * from sys_user where username in (select leader from sys_dept where id in ",
-            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>",
-            "#{id}",
-            "</foreach>)",
+            "select * from sys_user where username in (select leader from sys_dept where id in "
+                    + "<foreach item='id' collection='ids' open='(' separator=',' close=')'>"
+                    + "#{id}"
+                    + "</foreach>)",
             "</script>"
     })
     List<User> getLeader(@Param("ids") List<String> ids);
@@ -29,10 +29,10 @@ public interface DeptDao extends BaseDao<Dept> {
 
     @Select({
             "<script>",
-            "select * from sys_user where dept_id in",
-            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>",
-            "#{roleId}",
-            "</foreach>",
+            "select * from sys_user where dept_id in"
+                    + "<foreach item='id' collection='ids' open='(' separator=',' close=')'>"
+                    + "#{roleId}"
+                    + "</foreach>",
             "</script>"
     })
     List<User> getUsers(@Param("ids") List<String> ids);
@@ -40,14 +40,14 @@ public interface DeptDao extends BaseDao<Dept> {
 
     @Select({
             "<script>",
-            "select * from sys_user where dept_id in",
-            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>",
-            "#{id}",
-            "</foreach>",
-            "and username in",
-            "<foreach item='id' collection='roleIds' open='(' separator=',' close=')'>",
-            "#{id}",
-            "</foreach>",
+            "select * from sys_user where dept_id in"
+                    + "<foreach item='id' collection='ids' open='(' separator=',' close=')'>"
+                    + "#{id}"
+                    + "</foreach>"
+                    + "and username in"
+                    + "<foreach item='id' collection='roleIds' open='(' separator=',' close=')'>"
+                    + "#{id}"
+                    + "</foreach>",
             "</script>"
     })
     List<User> getRoleUsers(@Param("ids") List<String> ids, @Param("roleIds") List<String> roleIds);

+ 8 - 8
flow-system/flow-system-biz/src/main/java/com/flow/dao/RoleDao.java

@@ -19,10 +19,10 @@ public interface RoleDao extends BaseDao<Role> {
 
     @Insert({
             "<script>",
-            "INSERT IGNORE INTO sys_role_menu (role_id, menu_id) VALUES",
-            "<foreach collection='menuIds' item='menuId' separator=','>",
-            "   (#{roleId}, #{menuId})",
-            "</foreach>",
+            "INSERT IGNORE INTO sys_role_menu (role_id, menu_id) VALUES"
+                    + "<foreach collection='menuIds' item='menuId' separator=','>"
+                    + "   (#{roleId}, #{menuId})"
+                    + "</foreach>",
             "</script>"
     })
     void setPermission(@Param("roleId") Long roleId, @Param("menuIds") List<Long> menuIds);
@@ -40,10 +40,10 @@ public interface RoleDao extends BaseDao<Role> {
 
     @Select({
             "<script>",
-            "select * from sys_user where username in (select user_id from sys_user_role where role_id in ",
-            "<foreach item='id' collection='roleIds' open='(' separator=',' close=')'>",
-            "#{id}",
-            "</foreach>)",
+            "select * from sys_user where username in (select user_id from sys_user_role where role_id in "
+                    + "<foreach item='id' collection='roleIds' open='(' separator=',' close=')'>"
+                    + "#{id}"
+                    + "</foreach>)",
             "</script>"
     })
     List<User> getUsers(@Param("roleIds") List<String> roleIds);

+ 8 - 8
flow-system/flow-system-biz/src/main/java/com/flow/dao/UserDao.java

@@ -19,20 +19,20 @@ public interface UserDao extends BaseDao<User> {
 
     @Insert({
             "<script>",
-                "INSERT IGNORE INTO sys_user_role (user_id, role_id) VALUES",
-                "<foreach collection='roleIds' item='roleId' separator=','>",
-                "   (#{userId}, #{roleId})",
-                "</foreach>",
+            "INSERT IGNORE INTO sys_user_role (user_id, role_id) VALUES"
+                    + "<foreach collection='roleIds' item='roleId' separator=','>"
+                    + "   (#{userId}, #{roleId})"
+                    + "</foreach>",
             "</script>"
     })
     void authRoles(@Param("userId") String userId, @Param("roleIds") Set<String> roleIds);
 
     @Delete({
             "<script>",
-                "DELETE FROM sys_user_role WHERE user_id = #{userId} AND role_id NOT IN"
-                        + "<foreach item='roleId' collection='roleIds' separator=',' open='(' close=')'>"
-                        + "#{roleId}"
-                        + "</foreach>",
+            "DELETE FROM sys_user_role WHERE user_id = #{userId} AND role_id NOT IN"
+                    + "<foreach item='roleId' collection='roleIds' separator=',' open='(' close=')'>"
+                    + "#{roleId}"
+                    + "</foreach>",
             "</script>"
     })
     void delNotExistRoles(@Param("userId") String userId, @Param("roleIds") Set<String> roleIds);