From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期一, 24 七月 2023 17:29:24 +0800 Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。 --- Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/feign/IUserClient.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/feign/IUserClient.java b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/feign/IUserClient.java index 3333042..eac5887 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/feign/IUserClient.java +++ b/Source/UBCS/ubcs-service-api/ubcs-user-api/src/main/java/com/vci/ubcs/system/user/feign/IUserClient.java @@ -42,6 +42,7 @@ String API_PREFIX = "/client"; String USER_INFO = API_PREFIX + "/user-info"; + String USER_ALL = API_PREFIX + "/user-all"; String USER_INFO_BY_TYPE = API_PREFIX + "/user-info-by-type"; String USER_INFO_BY_ID = API_PREFIX + "/user-info-by-id"; String USER_INFO_BY_ACCOUNT = API_PREFIX + "/user-info-by-account"; @@ -50,6 +51,7 @@ String SAVE_USER_LIST = API_PREFIX + "/save-user-list"; String REMOVE_USER = API_PREFIX + "/remove-user"; String UPDATE_USER = API_PREFIX+"/update-user"; + String UPDATE_USER_STRATEGY_STATUS = API_PREFIX+"/update-user_strategy_status"; /** * 鑾峰彇鐢ㄦ埛淇℃伅 @@ -79,6 +81,13 @@ */ @GetMapping(USER_INFO) R<UserInfo> userInfo(@RequestParam("tenantId") String tenantId, @RequestParam("account") String account); + + /** + * 鑾峰彇鎵�鏈夌敤鎴� + * @return + */ + @GetMapping(USER_ALL) + R<List<User>> selectAllUser(); /** * 鑾峰彇鐢ㄦ埛淇℃伅 @@ -134,4 +143,12 @@ @PostMapping(UPDATE_USER) R<Boolean> updateUser(@RequestBody User user); + /** + * 淇敼鐢ㄦ埛瀵嗙爜绛栫暐鏄惁淇敼鐘舵�� + * @param userIds + * @return + */ + @PostMapping(UPDATE_USER_STRATEGY_STATUS) + R<Boolean> updateStrategyStatus(@RequestParam List<Long> userIds); + } -- Gitblit v1.9.3