Browse Source

Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

rainco 7 years ago
parent
commit
9a100ad53b

+ 1 - 1
base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -318,7 +318,7 @@ public class AccountController {
      * @return
      * @return
      */
      */
     @PostMapping("/bind/roles")
     @PostMapping("/bind/roles")
-    public Result bindRoles(@RequestParam long accountId, @RequestParam String roleIds) {
+    public Result bindRoles(@RequestParam("accountId") Long accountId, @RequestParam("roleIds") String roleIds) {
         accountService.bindRoles(accountId, roleIds);
         accountService.bindRoles(accountId, roleIds);
         accountService.clearCache(accountId);
         accountService.clearCache(accountId);
         return Result.success();
         return Result.success();

+ 1 - 1
base-servers/account/account-server/src/main/resources/mapper/AccountRoleMapper.xml

@@ -32,6 +32,6 @@
         group by a.id,a.username,a.realname,a.email,a.mobile
         group by a.id,a.username,a.realname,a.email,a.mobile
     </select>
     </select>
     <delete id="unBindRolesById" parameterType="java.lang.Long">
     <delete id="unBindRolesById" parameterType="java.lang.Long">
-        DELETE FROM AC_ACCOUNT_COMPANY WHERE ACCOUNT_ID = #{id}
+        DELETE FROM AC_ACCOUNT_ROLE WHERE ACCOUNT_ID = #{id}
     </delete>
     </delete>
 </mapper>
 </mapper>