duyj il y a 3 ans
Parent
commit
9c3281574c

+ 18 - 9
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -104,6 +104,15 @@ public class WxController extends ApiBaseController {
         }else if(user.getRoles().size()==0){
             return AjaxResult.error(302,"当前用户:"+userId+",企业微信尚未分配用户权限,请联系管理员!");
         }else{
+            List<Ztree>  author = sysUserOrderAuthorService.userAuthorTreeDataFmt(user.getUserId());
+            if (author.size() > 0 && author.get(0).getChildren().size() > 1) {
+                user.setAuthorType("TUC");
+            } else if (author.size() > 0 && author.get(0).getChildren().size() == 1) {//设置BUSINESS_UNIT
+                user.setAuthorType(author.get(0).getChildren().get(0).getCode());
+            }else{
+                user.setAuthorType("DIY");//默认diy
+            }
+            user.setAuthor(author);
             return AjaxResult.success().putKV("sysUser",user);
         }
     }
@@ -479,15 +488,15 @@ public class WxController extends ApiBaseController {
         }
         String pass = EncryptPassWordClass.encryptPassword(user.getLoginName(),password,user.getSalt());
         if(pass.equals(user.getPassword())){
-//            List<Ztree>  author = sysUserOrderAuthorService.userAuthorTreeDataFmt(user.getUserId());
-//            if (author.size() > 0 && author.get(0).getChildren().size() > 1) {
-//                user.setAuthorType("TUC");
-//            } else if (author.size() > 0 && author.get(0).getChildren().size() == 1) {//设置BUSINESS_UNIT
-//                user.setAuthorType(author.get(0).getChildren().get(0).getCode());
-//            }else{
-//                user.setAuthorType("DIY");//默认diy
-//            }
-//            user.setAuthor(author);
+            List<Ztree>  author = sysUserOrderAuthorService.userAuthorTreeDataFmt(user.getUserId());
+            if (author.size() > 0 && author.get(0).getChildren().size() > 1) {
+                user.setAuthorType("TUC");
+            } else if (author.size() > 0 && author.get(0).getChildren().size() == 1) {//设置BUSINESS_UNIT
+                user.setAuthorType(author.get(0).getChildren().get(0).getCode());
+            }else{
+                user.setAuthorType("DIY");//默认diy
+            }
+            user.setAuthor(author);
             return AjaxResult.success().putKV("sysUser",user);
         }else{
             return AjaxResult.error(301,"密码错误");