Merge remote-tracking branch 'origin/master'

authentication/src/main/java/com/jzg/filter/TokenAuthenticationFilter.java

@@ -1,6 +1,7 @@
 package com.jzg.filter;
 
 import com.alibaba.fastjson.JSONObject;
+import com.jzg.commons.exception.TokenExpireException;
 import com.jzg.config.JzgTokenService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
@@ -12,6 +13,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import java.io.IOException;
@@ -20,6 +22,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
+@Component
 public class TokenAuthenticationFilter extends OncePerRequestFilter {
 
     private AuthenticationManager authenticationManager;
@@ -58,6 +61,16 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
             SecurityContextHolder.getContext().setAuthentication(authentication);
             filterChain.doFilter(request,response);
             return;
+        }else{
+            response.setContentType("application/json");
+            JSONObject json = new JSONObject();
+            json.put("code",401);
+            json.put("msg","token valied failed");
+            // 将 Token 返回给前端
+            response.getWriter().write(json.toJSONString());
+
+            // 确保状态码为 401 OK，不进行重定向
+            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
         }
     }
 }

commons/src/main/java/com/jzg/commons/entity/dto/DeleteAssociatedUsers.java

@@ -0,0 +1,23 @@
+package com.jzg.commons.entity.dto;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(description = "删除团队、电销、渠道关联的用户")
+public class DeleteAssociatedUsers {
+
+
+    @Schema(description = "团队、电销、渠道id")
+    @NotNull(message = "团队、电销、渠道id不能为空")
+    private Long id;
+
+    @Schema(description = "团队、电销、渠道关联的用户id")
+    @NotNull(message = "团队、电销、渠道关联的用户id不能为空")
+    private Long[] userIds;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/LeftSysOrganizationVo.java

@@ -20,5 +20,8 @@ public class LeftSysOrganizationVo {
     @Schema(description = "机构id")
     private Long deptId;
 
+    @Schema(description = "机构id")
+    private String deptName;
+
 
 }

commons/src/main/java/com/jzg/commons/entity/vo/SysOrganizationUserDetailsVo.java

@@ -0,0 +1,10 @@
+package com.jzg.commons.entity.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "团队、渠道、电销组用户详情")
+public class SysOrganizationUserDetailsVo {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationServiceImpl.java

@@ -91,8 +91,9 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
     @Override
     public HttpResult leftList(SysOrganizationParam sysOrganizationParam) {
         QueryWrapper<SysOrganization> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("name,id,system_code, (SELECT COUNT(1) FROM sys_organization_user_link WHERE sys_organization_user_link.organization_id = sys_organization.id) memberNumber");
-        queryWrapper.groupBy("name,id");
+        queryWrapper.select("id, system_code, name, dept_id, manager_id, describe_information, attribute," +
+                "(SELECT COUNT(1) FROM sys_organization_user_link WHERE sys_organization_user_link.organization_id = sys_organization.id) memberNumber," +
+                "(SELECT sys_dept.`name` FROM sys_dept WHERE sys_dept.id = sys_organization.dept_id) deptName");
         List<SysOrganization> sysOrganizations = sysOrganizationMapper.selectList(queryWrapper);
         List<LeftSysOrganizationVo> list = JSONObject.parseObject(JSONObject.toJSONString(sysOrganizations), List.class);
         return HttpResult.ok(list);