Merge remote-tracking branch 'origin/master'

田源

2023-10-10 c4a910701136d549575823a6afd8b353a8b6f1ad

 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/wrapper/UserWrapper.java

@@ -47,7 +47,7 @@
      List<String> roleName = SysCache.getRoleNames(user.getRoleId());
      List<String> deptName = SysCache.getDeptNames(user.getDeptId());
      List<String> postName = SysCache.getPostNames(user.getPostId());
      userVO.setTenantName(tenant.getTenantName());
      userVO.setTenantName(tenant==null?"":tenant.getTenantName());
      userVO.setRoleName(Func.join(roleName));
      userVO.setDeptName(Func.join(deptName));
      userVO.setPostName(Func.join(postName));