修复获取子账户接口的异常

src/main/java/com/welampiot/controller/UserController.java

@@ -185,15 +185,14 @@ public class UserController {
         dto.setRole(role);
         dto.setDepartment(department);
         dto.setCompanyId(companyId);
-        dto.setUsername(username);
-        UserDTO dto1 = userService.queryUserIdByUsername(dto.getUsername());
+        UserDTO dto1 = userService.queryUserIdByUsername(username);
         if (dto1 == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         dto.setId(dto1.getId());
         List<UserDTO> userList;
         if (dto1.getRole() == 1) {
-            userList = userService.getAllUserListByUserVO(dto);
+            userList = userService.getAllUserListByUserDTO(dto);
         } else {
-            userList = userService.getUserListByUserVO(dto);
+            userList = userService.getUserListByUserDTO(dto);
         }
         List<UserDTO> list = new ArrayList<>();
         userList.forEach(userDTO -> {
@@ -224,6 +223,8 @@ public class UserController {
             }
             list.add(userDTO);
         });
-        return BaseResult.success(list);
+        UserVO userVO = new UserVO();
+        userVO.setList(list);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,userVO);
     }
 }

src/main/java/com/welampiot/dao/UserDao.java

@@ -21,7 +21,7 @@ public interface UserDao {
     Integer getUserCount();
     Integer getUserCountByParentId(@Param("id") Integer id);
     Integer getSectionCountByZoneList(@Param("zoneList") List<String> zoneList);
-    List<UserDTO> getUserListByUserVO(UserDTO dto);
+    List<UserDTO> getUserListByUserDTO(UserDTO dto);
     UserDTO queryUserIdByUsername(@Param("username") String username);
-    List<UserDTO> getAllUserListByUserVO(UserDTO dto);
+    List<UserDTO> getAllUserListByUserDTO(UserDTO dto);
 }

src/main/java/com/welampiot/service/UserService.java

@@ -20,7 +20,7 @@ public interface UserService {
     UserVO getUserInfoById(Integer id);
     Integer getUserCount();
     Integer getUserCountByParentId(Integer id);
-    List<UserDTO> getUserListByUserVO(UserDTO dto);
+    List<UserDTO> getUserListByUserDTO(UserDTO dto);
     UserDTO queryUserIdByUsername(String username);
-    List<UserDTO> getAllUserListByUserVO(UserDTO dto);
+    List<UserDTO> getAllUserListByUserDTO(UserDTO dto);
 }

src/main/java/com/welampiot/service/impl/UserServiceImpl.java

@@ -86,8 +86,8 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<UserDTO> getUserListByUserVO(UserDTO dto) {
-        return userDao.getUserListByUserVO(dto);
+    public List<UserDTO> getUserListByUserDTO(UserDTO dto) {
+        return userDao.getUserListByUserDTO(dto);
     }
 
     @Override
@@ -96,7 +96,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<UserDTO> getAllUserListByUserVO(UserDTO dto) {
-        return userDao.getAllUserListByUserVO(dto);
+    public List<UserDTO> getAllUserListByUserDTO(UserDTO dto) {
+        return userDao.getAllUserListByUserDTO(dto);
     }
 }

src/main/resources/mapper/UserMapper.xml

@@ -99,9 +99,9 @@
         </if>
     </select>
 
-    <!-- role为2查询它的所有子账号 -->
-    <select id="getUserListByUserVO" resultType="com.welampiot.dto.UserDTO">
-        select u.id,u.name,u.avatar,u.username,u.company,u.role,u.department
+    <!-- role为2时查询下级子账户 -->
+    <select id="getUserListByUserDTO" resultType="com.welampiot.dto.UserDTO">
+        select u.id,u.name,u.avatar,u.username,u.company,u.role,u.department,u.privilege_list as privilegeList
         from user u
         where u.parent_id = #{id}
         <if test="keyword != null and keyword != ''">
@@ -156,9 +156,9 @@
         </if>
     </select>
 
-    <!-- role为1查询所有账号 -->
-    <select id="getAllUserListByUserVO" resultType="com.welampiot.dto.UserDTO">
-        select u.id,u.name,u.avatar,u.username,u.company,u.role,u.department
+    <!-- role为1时查询所有用户 -->
+    <select id="getAllUserListByUserDTO" resultType="com.welampiot.dto.UserDTO">
+        select u.id,u.name,u.avatar,u.username,u.company,u.department,u.privilege_list as privilegeList
         from user u
         where 1=1
         <if test="keyword != null and keyword != ''">