Bläddra i källkod

解决方法名重复

caixiaofeng 10 månader sedan
förälder
incheckning
47f40f8a2b

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

@@ -22,7 +22,7 @@ public interface DeptDao extends BaseDao<Dept> {
                     + "</foreach>)",
             "</script>"
     })
-    List<User> getLeader(@Param("ids") List<String> ids);
+    List<User> getLeaders(@Param("ids") List<String> ids);
 
     @Select("select * from sys_user where dept_id = #{id}")
     List<User> getUsers(@Param("id") String id);
@@ -35,7 +35,7 @@ public interface DeptDao extends BaseDao<Dept> {
                     + "</foreach>",
             "</script>"
     })
-    List<User> getUsers(@Param("ids") List<String> ids);
+    List<User> getUsersByIds(@Param("ids") List<String> ids);
 
 
     @Select({

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

@@ -46,7 +46,7 @@ public interface RoleDao extends BaseDao<Role> {
                     + "</foreach>)",
             "</script>"
     })
-    List<User> getUsers(@Param("roleIds") List<String> roleIds);
+    List<User> getUsersByIds(@Param("roleIds") List<String> roleIds);
 
     @Select("select * from sys_user where username in (select user_id from sys_user_role where role_id = #{roleId})")
     List<User> getUsers(@Param("roleId") String roleId);

+ 2 - 2
flow-system/flow-system-biz/src/main/java/com/flow/service/impl/DeptServiceImpl.java

@@ -125,7 +125,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptDao, Dept> implements D
 
     @Override
     public List<User> getLeader(List<String> ids) {
-        return deptDao.getLeader(ids);
+        return deptDao.getLeaders(ids);
     }
 
     @Override
@@ -135,7 +135,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptDao, Dept> implements D
 
     @Override
     public List<User> getUsers(List<String> ids) {
-        return deptDao.getUsers(ids);
+        return deptDao.getUsersByIds(ids);
     }
 
     @Override

+ 1 - 1
flow-system/flow-system-biz/src/main/java/com/flow/service/impl/RoleServiceImpl.java

@@ -92,6 +92,6 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, Role> implements R
 
     @Override
     public List<User> getUsers(List<String> roleIds) {
-        return roleDao.getUsers(roleIds);
+        return roleDao.getUsersByIds(roleIds);
     }
 }