Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -458,7 +458,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "获取可选业务员列表")
     @GetMapping(value = "/getAllUsers")
     public HttpResult getAllUsers(@RequestParam(required = false) String userId) {
-        List<SysUser> userList = sysUserService.getAllUsers(userId);
+        List<SysUser> userList = sysUserService.findAllAgentRoleUser(userId);
         return HttpResult.ok(userList);
 
     }

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -145,6 +145,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select(userSql)
     SysUserBaseVO selectUserById(@Param("userId") String userId);
 
+    String selectSql = "SELECT u.* FROM sys_user u " +
+            "LEFT JOIN sys_user_role sur ON sur.user_id = u.id " +
+            " WHERE sur.role_id IN ('20') and u.status=1 " +
+            "<if test='userId!=\"\" '>" +
+            "   and u.id=#{userId} " +
+            "</if> " ;
+
+    @Select({"<script>",selectSql,"</script>"})
+    List<SysUser> findAllAgentRoleUser(@Param("userId") String userId);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -101,6 +101,7 @@ public interface SysUserService extends IService<SysUser> {
 
     public List<SysUser> getAllUsers(String userId);
 
+    public List<SysUser> findAllAgentRoleUser(String deptId);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -502,6 +502,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUser> lst = list(lqw);
         return lst;
     }
+
+    @Override
+    public List<SysUser> findAllAgentRoleUser(String deptId) {
+        return super.baseMapper.findAllAgentRoleUser(deptId);
+    }
 }