diff --git a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml
index 8a7cf37..dcdda59 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml
@@ -97,12 +97,12 @@ select id,type,module_name,module_code,function_name,function_code,permission_na
 
 
 <sql id="orderAndLimit">
-<if test="sort != null and sort != '' ">
-order by ${sort} 
+
+order by weight
 <if test="need != null">
 limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
 </if>
-</if>
+
 </sql>
 
 
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java
index b89450f..0c8d5ce 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java
@@ -25,7 +25,7 @@ public class LoginUtil {
             int statusCode = post.getStatusCode();
             String result = new String(post.getResponseBodyAsString());
             post.releaseConnection();
-            if(200 == statusCode) {
+            if (200 == statusCode) {
                 LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
                 return loginState;
             }
@@ -51,9 +51,9 @@ public class LoginUtil {
             String result = new String(post.getResponseBodyAsString());
 
             post.releaseConnection();
-            if(200 == statusCode) {
+            if (200 == statusCode) {
                 LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
-                if(0 == loginState.getErrorcode()) {
+                if (0 == loginState.getErrorcode()) {
                     return loginState.getId();
                 }
             }
@@ -79,9 +79,9 @@ public class LoginUtil {
             String result = new String(post.getResponseBodyAsString());
 
             post.releaseConnection();
-            if(200 == statusCode) {
+            if (200 == statusCode) {
                 LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
-                if(0 == loginState.getErrorcode()) {
+                if (0 == loginState.getErrorcode()) {
                     return loginState.getToken();
                 }
             }
@@ -107,9 +107,9 @@ public class LoginUtil {
             String result = new String(post.getResponseBodyAsString());
 
             post.releaseConnection();
-            if(200 == statusCode) {
+            if (200 == statusCode) {
                 LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
-                if(0 == loginState.getErrorcode()) {
+                if (0 == loginState.getErrorcode()) {
                     return loginState.getToken();
                 }
             }
@@ -119,6 +119,17 @@ public class LoginUtil {
         return null;
     }
 
+    public static void deleteToken(String token) {
+        try {
+            MessageUtil.UTF8GetMethod utf8GetMethod = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/logout.action");
+            utf8GetMethod.setRequestHeader("Authorization", token);
+            HttpClient client = new HttpClient();
+            client.executeMethod(utf8GetMethod);
+        } catch (Exception e) {
+            ExceptionUtils.catchException(e, "delete token , " + e.getMessage());
+        }
+    }
+
     public static LoginContext sendVerCode(String phone, String typeId, String token) {
         HttpClient client = new HttpClient();
         String query = "?phone=" + phone + "&typeId=" + typeId + "&token=" + token + "&userType=2";
@@ -130,7 +141,7 @@ public class LoginUtil {
             int statusCode = get.getStatusCode();
             String result = new String(get.getResponseBodyAsString());
             get.releaseConnection();
-            if(200 == statusCode) {
+            if (200 == statusCode) {
                 LoginContext loginState = JsonUtil.str2Obj(result, LoginContext.class);
                 return loginState;
             }
@@ -144,7 +155,7 @@ public class LoginUtil {
     public static LoginContext checkLoginState(String token) {
         LoginContext loginState = new LoginContext();
         HttpClient client = new HttpClient();
-        String query = "?token=" + token ;
+        String query = "?token=" + token;
         GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/check.action" + query);
         get.setRequestHeader("Authorization", token);
         try {
@@ -152,7 +163,7 @@ public class LoginUtil {
             int statusCode = get.getStatusCode();
             String result = new String(get.getResponseBodyAsString());
             get.releaseConnection();
-            if(200 == statusCode) {
+            if (200 == statusCode) {
                 loginState = JsonUtil.str2Obj(result, LoginContext.class);
                 return loginState;
             }
@@ -163,11 +174,9 @@ public class LoginUtil {
     }
 
 
-
-
     public static String md5(String plainText) {
         try {
-            if(plainText==null){
+            if (plainText == null) {
                 return null;
             }
             MessageDigest md = MessageDigest.getInstance("MD5");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index ed5188a..213d17a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -7,7 +7,9 @@ import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.constants.ConstantInterface;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
-import com.lyms.platform.common.utils.*;
+import com.lyms.platform.common.utils.JsonUtil;
+import com.lyms.platform.common.utils.LoginUtil;
+import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.operate.web.result.FrontEndResult;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.*;
@@ -54,7 +56,6 @@ public class UsersController extends BaseController {
     private static final String LYMS = "龙源美生";
 
 
-
     /**
      * 获取管理员列表
      */
@@ -62,10 +63,10 @@ public class UsersController extends BaseController {
     @ResponseBody
     @TokenRequired
     public FrontEndResult getAdminList(HttpServletResponse response,
-                               @RequestParam(value = "keyword", required = false) String keyword,
-                               @RequestParam(value = "rolesId", required = false) Integer rolesId,
-                               @RequestParam(value = "page", required = false) Integer page,
-                               @RequestParam(value = "limit", required   = false) Integer limit) {
+                                       @RequestParam(value = "keyword", required = false) String keyword,
+                                       @RequestParam(value = "rolesId", required = false) Integer rolesId,
+                                       @RequestParam(value = "page", required = false) Integer page,
+                                       @RequestParam(value = "limit", required = false) Integer limit) {
 
         limit = limit == null ? 10 : limit;
         page = page == null ? 1 : page;
@@ -82,7 +83,7 @@ public class UsersController extends BaseController {
 
         List<Users> users = usersService.queryUsers2(usersQuery);
         //设置用户角色信息
-        for(Users user : users) {
+        for (Users user : users) {
             user.setRoles(this.getUserRoles(user.getId()));
             user.setOrganization(organizationService.getOrganization(user.getOrgId()));
             user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
@@ -97,7 +98,6 @@ public class UsersController extends BaseController {
     }
 
 
-
     /**
      * 获取用户列表
      */
@@ -105,12 +105,12 @@ public class UsersController extends BaseController {
     @TokenRequired
     @ResponseBody
     public FrontEndResult getPermissions(HttpServletResponse response,
-                               @RequestParam(value = "keyword", required = false) String keyword,
-                               @RequestParam(value = "rolesId", required = false) Integer rolesId,
-                               @RequestParam(value = "page", required = false) Integer page,
-                               @RequestParam(value = "limit", required = false) Integer limit,
-                               @RequestParam(value = "orgId", required = false) Integer orgId,
-                               @RequestParam(value = "deptId", required = false) Integer deptId) {
+                                         @RequestParam(value = "keyword", required = false) String keyword,
+                                         @RequestParam(value = "rolesId", required = false) Integer rolesId,
+                                         @RequestParam(value = "page", required = false) Integer page,
+                                         @RequestParam(value = "limit", required = false) Integer limit,
+                                         @RequestParam(value = "orgId", required = false) Integer orgId,
+                                         @RequestParam(value = "deptId", required = false) Integer deptId) {
 
         limit = limit == null ? 10 : limit;
         page = page == null ? 1 : page;
@@ -131,7 +131,7 @@ public class UsersController extends BaseController {
         List<Users> users = usersService.queryUsers2(usersQuery);
 
         //设置用户角色信息
-        for(Users user : users) {
+        for (Users user : users) {
             user.setRoles(this.getUserRoles(user.getId()));
             user.setOrganization(organizationService.getOrganization(user.getOrgId()));
             user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
@@ -147,13 +147,13 @@ public class UsersController extends BaseController {
     }
 
     //获取用户角色信息
-    private  List<Roles> getUserRoles(Integer userId) {
+    private List<Roles> getUserRoles(Integer userId) {
         UserRoleMapsQuery query = new UserRoleMapsQuery();
         query.setUserId(userId);
         query.setYn(YnEnums.YES.getId());
         List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
         List<Roles> roles = new ArrayList<>();
-        for(UserRoleMaps roleMaps : userRoleMapses) {
+        for (UserRoleMaps roleMaps : userRoleMapses) {
             roles.add(rolesService.getRoles(roleMaps.getRoleId()));
         }
         return roles;
@@ -179,13 +179,13 @@ public class UsersController extends BaseController {
         UsersQuery usersQuery = new UsersQuery();
         usersQuery.setPhone(account);
         List<Users> users = usersService.queryUsers(usersQuery);
-        if(0 == users.size()) {
+        if (0 == users.size()) {
             ResultUtils.buildParameterErrorResultAndWrite(response, "该账户不存在");
             return;
         }
 
-        String key =LoginUtil.login(account, code, typeId, token);
-        if(null != key) {
+        String key = LoginUtil.login(account, code, typeId, token);
+        if (null != key) {
             Users users1 = new Users();
             users1.setId(users.get(0).getId());
             users1.setLastLoginTime(new Date());
@@ -194,7 +194,7 @@ public class UsersController extends BaseController {
             Map<String, Object> result = new HashMap<>();
             result.put("token", key);
             ResultUtils.buildSuccessResultAndWrite(response, result);
-        }else {
+        } else {
             ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.PARAMETER_ERROR, "登录失败,手机或验证码错误");
         }
     }
@@ -217,18 +217,18 @@ public class UsersController extends BaseController {
         usersQuery.setPhone(phone);
         usersQuery.setYn(YnEnums.YES.getId());
         List<Users> list = usersService.queryUsers(usersQuery);
-        if(0 == list.size()) {
+        if (0 == list.size()) {
             ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在");
             return;
         }
 
-        if(list.get(0).getEnable().equals(2)) {
+        if (list.get(0).getEnable().equals(2)) {
             ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户已被禁用");
             return;
         }
 
         LoginContext loginContext = LoginUtil.sendVerCode(phone, typeId, token);
-        if(null != loginContext) {
+        if (null != loginContext) {
             ResultUtils.buildResultAndWrite(httpServletResponse, loginContext.getErrorcode(), loginContext.getErrormsg());
             return;
         }
@@ -245,7 +245,7 @@ public class UsersController extends BaseController {
     public void usersLoginMsg(HttpServletResponse response, HttpServletRequest request) {
         LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
         Users users = null;
-        if(null != loginContext) {
+        if (null != loginContext) {
             users = usersService.getUsers(loginContext.getId());
         }
 
@@ -256,8 +256,8 @@ public class UsersController extends BaseController {
         List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query);
         List<Roles> roles = new ArrayList<>();
         List<Permissions> permissions = null;
-        RolePermissionMapsQuery rolePermissionMapsQuery ;
-        for(Integer roleMaps : userRoleMapses) {
+        RolePermissionMapsQuery rolePermissionMapsQuery;
+        for (Integer roleMaps : userRoleMapses) {
             roles.add(rolesService.getRoles(roleMaps));
 
             //获取角色权限信息
@@ -265,10 +265,10 @@ public class UsersController extends BaseController {
             rolePermissionMapsQuery.setRoleId(roleMaps);
             rolePermissionMapsQuery.setYn(YnEnums.YES.getId());
             List<RolePermissionMaps> rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery);
-            for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
+            for (RolePermissionMaps rolePermissionMaps : rolePermissionMapses) {
                 Permissions permissions1 = permissionsService.getPermissions(rolePermissionMaps.getPermissionId());
-                if(null != permissions1) {
-                    if(null == permissions) {
+                if (null != permissions1) {
+                    if (null == permissions) {
                         permissions = new ArrayList<>();
                     }
                     permissions.add(permissions1);
@@ -292,12 +292,12 @@ public class UsersController extends BaseController {
     @RequestMapping(value = "/users/userRole/{id}", method = RequestMethod.GET)
     @TokenRequired
     public void userRole(HttpServletResponse response, HttpServletRequest request, @PathVariable(value = "id") Integer id) {
-       UserRoleMapsQuery query = new UserRoleMapsQuery();
+        UserRoleMapsQuery query = new UserRoleMapsQuery();
         query.setUserId(id);
         query.setYn(YnEnums.YES.getId());
         List<UserRoleMaps> userRoleMapses = userRoleMapsService.queryUserRoleMaps(query);
         List<Roles> roles = new ArrayList<>();
-        for(UserRoleMaps roleMaps : userRoleMapses) {
+        for (UserRoleMaps roleMaps : userRoleMapses) {
             roles.add(rolesService.getRoles(roleMaps.getRoleId()));
         }
 
@@ -305,13 +305,12 @@ public class UsersController extends BaseController {
     }
 
 
-
     /**
      * 管理员权限设置
      */
     @RequestMapping(value = "/adminPermissions", method = RequestMethod.POST)
     @TokenRequired
-    public void adminPermissions(HttpServletResponse response,@RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids){
+    public void adminPermissions(HttpServletResponse response, @RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids) {
 
         if (ids == null) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
@@ -330,7 +329,7 @@ public class UsersController extends BaseController {
             return;
         }
 
-        if(!usersList.get(0).getType().equals(0)) {
+        if (!usersList.get(0).getType().equals(0)) {
             ResultUtils.buildParameterErrorResultAndWrite(response, "用户错误");
         }
 
@@ -338,8 +337,8 @@ public class UsersController extends BaseController {
         UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
         userOrganizationMapsQuery.setUserId(userId);
         List<UserOrganizationMaps> userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
-        if(0 < userOrganizationMapsList.size()) {
-            for(UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
+        if (0 < userOrganizationMapsList.size()) {
+            for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) {
                 userOrganizationMaps.setYn(YnEnums.NO.getId());
                 userOrganizationMapsService.updateUserOrganizationMaps(userOrganizationMaps);
             }
@@ -347,12 +346,12 @@ public class UsersController extends BaseController {
 
         //添加最新权限映射
         String[] roleArrayIds = ids.split(",");
-        Users user  =  usersList.get(0);
+        Users user = usersList.get(0);
         UserOrganizationMaps userOrganizationMaps = null;
         Organization organization = null;
         for (String id : roleArrayIds) {
             organization = organizationService.getOrganization(Integer.valueOf(id));
-            if(null != organization) {
+            if (null != organization) {
                 userOrganizationMaps = new UserOrganizationMaps();
                 userOrganizationMaps.setUserId(user.getId());
                 userOrganizationMaps.setOrgId(Integer.valueOf(id));
@@ -378,7 +377,7 @@ public class UsersController extends BaseController {
     public void addAdmin(HttpServletResponse response,
                          HttpServletRequest request,
                          @RequestParam(value = "name", required = false) String name,
-                         @RequestParam(value = "account", required = false)String account,
+                         @RequestParam(value = "account", required = false) String account,
                          @RequestParam(value = "phone") String phone,
                          @RequestParam(value = "enable") Integer enable,
                          @RequestParam(value = "remarks", required = false) String remarks,
@@ -391,7 +390,7 @@ public class UsersController extends BaseController {
 
 
         if (StringUtils.isBlank(roleIds) ||
-                StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user ) {
+                StringUtils.isBlank(name) || StringUtils.isBlank(phone) || null == user) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
             return;
         }
@@ -428,7 +427,7 @@ public class UsersController extends BaseController {
 
             //关联登录中心ID
             LoginContext loginContext = LoginUtil.register(phone, token, typeId);
-            if(!loginContext.getErrorcode().equals(0)) {
+            if (!loginContext.getErrorcode().equals(0)) {
                 ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
                 return;
             }
@@ -442,7 +441,7 @@ public class UsersController extends BaseController {
             UserRoleMaps userRoleMaps = new UserRoleMaps();
 
             String[] roleArrayIds = roleIds.split(",");
-            List<Users> user1  =  usersService.queryUsers(usersQuery);
+            List<Users> user1 = usersService.queryUsers(usersQuery);
             for (String id : roleArrayIds) {
                 Roles roles = rolesService.getRoles(Integer.valueOf(id));
                 if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
@@ -472,7 +471,7 @@ public class UsersController extends BaseController {
                          @RequestParam(value = "deptId", required = false) Integer deptId,
                          @RequestParam(value = "ksId", required = false) Integer ksId,
                          @RequestParam(value = "name", required = false) String name,
-                         @RequestParam(value = "account", required = false)String account,
+                         @RequestParam(value = "account", required = false) String account,
                          @RequestParam(value = "phone") String phone,
                          @RequestParam(value = "enable") Integer enable,
                          @RequestParam(value = "remarks", required = false) String remarks,
@@ -484,11 +483,11 @@ public class UsersController extends BaseController {
         Users user = usersService.getUsers(loginState.getId());
 
 
-        if ( StringUtils.isBlank(roleIds)  || StringUtils.isBlank(phone) || null == user ) {
+        if (StringUtils.isBlank(roleIds) || StringUtils.isBlank(phone) || null == user) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
             return;
         }
-        if(deptId == null && ksId == null) {
+        if (deptId == null && ksId == null) {
             ResultUtils.buildParameterErrorResultAndWrite(response, "deptId or ksId required");
             return;
         }
@@ -528,7 +527,7 @@ public class UsersController extends BaseController {
 
             //关联登录中心ID
             LoginContext loginContext = LoginUtil.register(phone, token, typeId);
-            if(!loginContext.getErrorcode().equals(0)) {
+            if (!loginContext.getErrorcode().equals(0)) {
                 ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, loginContext.getErrormsg());
                 return;
             }
@@ -541,7 +540,7 @@ public class UsersController extends BaseController {
             UserRoleMaps userRoleMaps = new UserRoleMaps();
 
             String[] roleArrayIds = roleIds.split(",");
-            List<Users> user1  =  usersService.queryUsers(usersQuery);
+            List<Users> user1 = usersService.queryUsers(usersQuery);
             for (String id : roleArrayIds) {
                 Roles roles = rolesService.getRoles(Integer.valueOf(id));
                 if (roles == null || roles.getYn() == YnEnums.NO.getId()) {
@@ -560,7 +559,6 @@ public class UsersController extends BaseController {
     }
 
 
-
 //    /**
 //     * 添加用户信息
 //     */
@@ -665,16 +663,14 @@ public class UsersController extends BaseController {
     public void updateUsers(HttpServletResponse response,
                             HttpServletRequest request,
                             @PathVariable(value = "id") Integer id,
-                            @RequestParam(value = "name",required = false) String name,
-                            @RequestParam(value = "account",required = false)String account,
-                            @RequestParam(value = "phone",required = false) String phone,
-                            @RequestParam(value = "enable",required = false) Integer enable,
-                            @RequestParam(value = "remarks",required = false) String remarks,
-                            @RequestParam(value = "roleIds",required = false) String roleIds,
-                            @RequestParam(value = "orgId",required = false) Integer orgId,
-                            @RequestParam(value = "deptId",required = false) Integer deptId) {
-
-
+                            @RequestParam(value = "name", required = false) String name,
+                            @RequestParam(value = "account", required = false) String account,
+                            @RequestParam(value = "phone", required = false) String phone,
+                            @RequestParam(value = "enable", required = false) Integer enable,
+                            @RequestParam(value = "remarks", required = false) String remarks,
+                            @RequestParam(value = "roleIds", required = false) String roleIds,
+                            @RequestParam(value = "orgId", required = false) Integer orgId,
+                            @RequestParam(value = "deptId", required = false) Integer deptId) {
 
 
         //获取登录用户
@@ -709,7 +705,7 @@ public class UsersController extends BaseController {
 
 
             //如有角色,则对用户角色中间表先删除后新增
-            if(null != roleIds) {
+            if (null != roleIds) {
 
                 Integer _userId = usersList.get(0).getId();
                 UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
@@ -746,7 +742,7 @@ public class UsersController extends BaseController {
      */
     @RequestMapping(value = "/users/enable", method = RequestMethod.POST)
     @TokenRequired
-    public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) {
+    public void enableUsers(HttpServletResponse response, @RequestParam Integer id, @RequestParam Integer flag) {
 
 
         //检查账户是否存在
@@ -770,14 +766,12 @@ public class UsersController extends BaseController {
     }
 
 
-
-
     /**
      * 用户删除
      */
     @RequestMapping(value = "/users/{id}", method = RequestMethod.DELETE)
     @TokenRequired
-    public void deleteUsers(HttpServletResponse response,@PathVariable Integer id) {
+    public void deleteUsers(HttpServletResponse response, @PathVariable Integer id) {
         if (null == id) {
             ResultUtils.buildIdIsNull(response);
             return;
@@ -819,7 +813,6 @@ public class UsersController extends BaseController {
     }
 
 
-
     /**
      * 修改用户密码
      */
@@ -877,4 +870,16 @@ public class UsersController extends BaseController {
         usersService.updateUsers(users);
         ResultUtils.buildSuccessResultAndWrite(response);
     }
+
+    @RequestMapping(value = "/logout", method = RequestMethod.GET)
+    @ResponseBody
+    public Map<String, Object> resetToken(@RequestHeader(value = "Authorization", required = false) String token) {
+        if (StringUtils.isNotEmpty(token)) {
+            LoginUtil.deleteToken(token);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("errorcode", ConstantInterface.SUCCESS);
+        result.put("errormsg", "update");
+        return result;
+    }
 }