Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/api/SmartAuthorGroupControllerAPI.java

@@ -63,7 +63,7 @@ public interface SmartAuthorGroupControllerAPI {
 
     @RequestMapping(value = "/queryUserAuthor")
     @ApiOperation(value = "查看用户个人权限", notes = "编辑权限组数据", httpMethod = "POST")
-    public CommonResult queryUserAuthor(@RequestParam String userId);
+    public CommonResult queryUserAuthor(@RequestParam String userId,@RequestParam String userHead);
 
     @RequestMapping(value = "/querySmartAuthorGroup")
     @ApiOperation(value = "权限组分页数据", notes = "权限组分页数据", httpMethod = "GET")

src/main/java/com/template/controller/SmartAuthorGroupController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.template.annotation.DESRespondSecret;
 import com.template.annotation.PassToken;
 import com.template.api.SmartAuthorGroupControllerAPI;
+import com.template.common.utils.AesUtils;
 import com.template.common.utils.TimeExchange2;
 import com.template.common.utils.TreeRecordsUtil;
 import com.template.common.utils.UUIDUtil;
@@ -613,7 +614,10 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
     @PassToken
     @Override
     @DESRespondSecret(validated = false)
-    public CommonResult queryUserAuthor(String userId) {
+    public CommonResult queryUserAuthor(String userId,String userHead) {
+        if (userId==null || userId.equals("")){
+            userId = AesUtils.decrypt(userHead);
+        }
         String[] userids = userId.split(",");
         QueryWrapper<SmartAuthority> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("deleted", 0);

src/main/java/com/template/controller/WechatScanLoginController.java

@@ -200,7 +200,8 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                     queryWrapper3.eq("user_id", userc.get(0).getId());
                     List<SmartAuthority> query = smartAuthorityService.getAuthorByKey(queryWrapper3);
                     if (query.size() > 0) {
-                        return "redirect:" + HttpParame.FRONT_URI + "/#/wanzai/home?token=" + token;
+                        String userhead = AesUtils.encrypt(String.valueOf(userc.get(0).getId()));
+                        return "redirect:" + HttpParame.FRONT_URI + "/#/wanzai/home?token=" + token+"&userhead="+userhead;
                     } else {
                         return "redirect:" + HttpParame.FRONT_URI + "/#/login?message=" + URLEncoder.encode("无登录权限", "UTF-8");
                     }