Merge remote-tracking branch 'origin/master'

user_auth/src/main/java/com/huaxu/controller/UserController.java

@@ -162,16 +162,19 @@ public class UserController {
         int result = userService.insertRegister(user);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
-    @RequestMapping(value = "getUserStatus", method = RequestMethod.POST)
-    @ApiOperation(value = "获取用户当前状态",notes = "返回0代表超时，其他代表用户被禁用了")
+    @RequestMapping(value = "getUserStatus")
+    @ApiOperation(value = "获取用户当前状态",notes = "返回0代表超时，1有其他用户登录了，其他用户被禁用")
     public AjaxMessage<Integer> getUserStatus(@ApiParam(value = "accessToken", required = true)@RequestParam String accessToken) {
        String key="offlineStatus:"+ accessToken;
         byte[] bytes = redisUtil.get(key.getBytes());
-        Optional<Integer> status = ByteArrayUtils.bytesToObject(bytes);
         int result=0;
-        if(status!=null){
+        if(bytes!=null){
+            Optional<Integer> status = ByteArrayUtils.bytesToObject(bytes);
             result=status.get();
         }
+
+
+
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
 

user_auth/src/main/java/com/huaxu/service/UserService.java

@@ -92,6 +92,6 @@ public interface UserService {
      * @return 影响行数
      */
     int insertRegister(User user);
-     void offline(String clientId, Integer userId, String status);
+     void offline(String clientId, Integer userId, Integer status);
 
 }

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -172,7 +172,7 @@ public class UserServiceImpl implements UserService {
     }
 
 
-    public void offline(String clientId, Integer userId, String status) {
+    public void offline(String clientId, Integer userId, Integer status) {
         Collection<OAuth2AccessToken> c = tokenStore.findTokensByClientIdAndUserName(clientId, String.valueOf(userId));
         System.out.println(c.size());
         for (OAuth2AccessToken oAuth2AccessToken : c) {
@@ -219,7 +219,7 @@ public class UserServiceImpl implements UserService {
         if(returnFlag){
             return user;
         }
-        offline("smart-city-v2",user.getId(),"1");
+        offline("smart-city-v2",user.getId(),1);
 
 
         getDataPermission(permission.getPermissionType(),user,programItems);

user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -278,12 +278,9 @@ public class OrgServiceImpl implements OrgService {
             for (OrgTree orgTree : list) {
 
                 if (id.equals(orgTree.getParentOrgId())) {
-                    //拥有权限可以显示
-                    if(orgIds!=null&&orgIds.contains(orgTree.getId())){
-                        orgTree.setDisabled(false);
-                    }else{
+
                         orgTree.setDisabled(true);
-                    }
+
                     List<OrgTree> chidren = getOrgTree(list, orgTree.getId(),level,orgIds);
                     OrgTree temPermission = new OrgTree();
                     BeanUtils.copyProperties(orgTree, temPermission);