123

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -174,6 +174,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
             if (parentLock(userId)) {
                 AppUserRelation relation = getMyBiz().getRelationByUserId(userId);
                 if (relation == null) {
+                    log.info("insertLock----parentId===" +userId);
                     relation = new AppUserRelation();
                     relation.setUserId(userId);
                     relation.setBindType(type);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -8,6 +8,7 @@ import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
@@ -276,4 +277,12 @@ public class AppUserRest {
     }
 
 
+    /*@GetMapping("/app/unauth/test")
+    @IgnoreUserToken
+    public ObjectRestResponse test(){
+        appPermissionService.test();
+        return ObjectRestResponse.succ();
+    }
+*/
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -407,6 +407,7 @@ public class AppPermissionService {
             rsUserDetail.setUserid(userId);
             rsUserDetail = appUserDetailBiz.selectOne(rsUserDetail);
             if (rsUserDetail == null) {
+                rsUserDetail=new AppUserDetail();
                 rsUserDetail.setUserid(userId);
                 rsUserDetail.setNickname(nickname);
                 rsUserDetail.setHeadimgurl(SystemConfig.USER_HEADER_URL_DEFAULT); // 默认路径，待写