From cdba4febf23c6f55346a474579361923aacf0bc9 Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期一, 02 十二月 2024 14:54:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java index f3d796e..5e1a0c2 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java @@ -174,6 +174,25 @@ } } + + /** + * 浣跨敤褰撳墠鐢ㄦ埛鐨勭被鍨嬫煡璇㈢敤鎴� + * @return + * @throws VciBaseException + */ + @RequestMapping(value = "/listUserByUserType",method = RequestMethod.GET) + public BaseResult<List<SmUserVO>> listUserByUserType() throws VciBaseException{ + try { + List<SmUserVO> smUserVOList = userQueryService.listUserByUserType(); + return BaseResult.dataList(smUserVOList); + }catch (Exception e){ + e.printStackTrace(); + String exceptionMessage = "閫氳繃褰撳墠鐢ㄦ埛鐨勭被鍨嬫潵鑾峰彇鐢ㄦ埛鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e); + logger.error(exceptionMessage); + return BaseResult.fail(exceptionMessage); + } + } + /** * 浣跨敤瑙掕壊鑾峰彇涓嶅湪鏌愪釜瑙掕壊涓嬬殑鐢ㄦ埛鍙傜収鍒楄〃 * @param pkRole 瑙掕壊鐨勪富閿紝涓嶈兘涓虹┖ @@ -363,6 +382,5 @@ //鑰佺殑椤圭洰渚濈劧鏄坊鍔爐ry catch锛屾柟娉曢噷涓嶆姏鍑哄紓甯� //BaseResult.fail("杩欓噷杩斿洖鍓嶇鐨勯敊璇俊鎭�"); } - } -- Gitblit v1.9.3