Merge branch 'dev' into 'master'

dev - master 38

See merge request !400

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -62,6 +62,16 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysPostService postService;
 
+    /**
+     * 主检角色id
+     */
+    private static final Long PRIMARY_INSPECTION = 112L;
+
+    /**
+     * 检验员角色id
+     */
+    private static final Long INSPECTION = 106L;
+
     /**
      * 获取用户列表
      */
@@ -96,6 +106,16 @@ public class SysUserController extends BaseController
         }
     }
 
+    @ApiOperation("通过角色名获取用户信息")
+    @PostMapping("/getUserByRoleInspection")
+    public R<List<SysUser>> getUserByRoleInspection() {
+
+        List<SysUser> PrimaryInspectionList = userService.selectUserByRoleInDept(PRIMARY_INSPECTION);
+        List<SysUser> InspectionList = userService.selectUserByRoleInDept(INSPECTION);
+        List<SysUser> list = (List<SysUser>) CollUtil.addAll(PrimaryInspectionList, InspectionList);
+        return R.ok(list);
+    }
+
     /**
      * 获取主检验人员列表
      * @return