Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/po/SysOrganization.java

@@ -34,4 +34,9 @@ public class SysOrganization extends BaseModel {
     @Schema(description = "关联人数")
     private int memberNumber;
 
+    @TableField(exist = false)
+    @Schema(description = "机构名称")
+    private String deptName;
+
+
 }

tenant/organization/src/main/java/com/jzg/organization/controller/SysOrganizationController.java

@@ -27,11 +27,18 @@ public class SysOrganizationController {
      */
     @Operation(summary = "团队、渠道、电销组 分页查询", description = "列表页面")
     @PostMapping("queryPageList")
-    public HttpResult queryPageList(@RequestBody SysOrganizationParam sysOrganizationParam){
+    public HttpResult queryPageList(@Validated @RequestBody SysOrganizationParam sysOrganizationParam){
         return sysOrganizationService.queryPageList(sysOrganizationParam);
     }
 
 
+    @Operation(summary = "团队、渠道、电销组", description = "详情页面")
+    @PostMapping("getDetails")
+    public HttpResult getDetails(@RequestParam("userId") Long userId){
+        return sysOrganizationService.getDetails(userId);
+    }
+
+
     /**
      * 列表
      * @param sysOrganizationParam
@@ -39,7 +46,7 @@ public class SysOrganizationController {
      */
     @Operation(summary = "团队、渠道、电销组", description = "左侧列表页面")
     @PostMapping("leftList")
-    public HttpResult leftList(@RequestBody SysOrganizationParam sysOrganizationParam){
+    public HttpResult leftList(@Validated @RequestBody SysOrganizationParam sysOrganizationParam){
         return sysOrganizationService.leftList(sysOrganizationParam);
     }
 
@@ -88,14 +95,14 @@ public class SysOrganizationController {
 
     /**
      * 删除团队、电销、渠道关联的用户
-     * @param id
+     * @param deleteAssociatedUsers
      * @return
      */
-//    @Operation(summary = "团队、渠道、电销组 通过ID删除", description = "通过ID删除")
-//    @GetMapping("deleteById")
-//    public HttpResult deleteById(@RequestParam("id") Long id){
-//        return sysOrganizationService.deleteById(id);
-//    }
+    @Operation(summary = "删除团队、电销、渠道关联的用户", description = "通过团队、电销、渠道删除")
+    @PostMapping("deleteAssociatedUsers")
+    public HttpResult deleteAssociatedUsers(@Validated @RequestBody DeleteAssociatedUsers deleteAssociatedUsers){
+        return sysOrganizationService.deleteAssociatedUsers(deleteAssociatedUsers);
+    }
 
 
     /**
@@ -105,7 +112,7 @@ public class SysOrganizationController {
      */
     @Schema(description = "新增团队、渠道、电销组用户")
     @PostMapping("addTeamUsers")
-    public HttpResult addTeamUsers(@RequestBody SysOrganizationUserLinkAdd organizationUserLinkAdd){
+    public HttpResult addTeamUsers(@Validated @RequestBody SysOrganizationUserLinkAdd organizationUserLinkAdd){
         return sysOrganizationService.addTeamUsers(organizationUserLinkAdd);
     }
 
@@ -117,7 +124,7 @@ public class SysOrganizationController {
      */
     @Schema(description = "设置团队、渠道、电销组负责人")
     @PostMapping("setResponsiblePerson")
-    public HttpResult setResponsiblePerson(@RequestBody SysOrganizationSetPerson setPerson){
+    public HttpResult setResponsiblePerson(@Validated @RequestBody SysOrganizationSetPerson setPerson){
         return sysOrganizationService.setResponsiblePerson(setPerson);
     }
 

tenant/organization/src/main/java/com/jzg/organization/mapper/SysOrganizationMapper.java

@@ -3,6 +3,7 @@ package com.jzg.organization.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.dto.SysOrganizationParam;
 import com.jzg.commons.entity.po.SysOrganization;
+import com.jzg.commons.entity.vo.SysOrganizationUserDetailsVo;
 import com.jzg.commons.entity.vo.SysOrganizationVo;
 import org.apache.ibatis.annotations.Select;
 
@@ -17,4 +18,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     @Select("select * from  sys_organization")
     List<SysOrganizationVo> queryPageList(SysOrganizationParam sysOrganizationParam);
 
+    @Select("")
+    SysOrganizationUserDetailsVo getDetails(Long userId);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysOrganizationService.java

@@ -2,10 +2,7 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.SysOrganizationAdd;
-import com.jzg.commons.entity.dto.SysOrganizationParam;
-import com.jzg.commons.entity.dto.SysOrganizationSetPerson;
-import com.jzg.commons.entity.dto.SysOrganizationUserLinkAdd;
+import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysOrganization;
 import com.jzg.commons.entity.vo.SysOrganizationVo;
 
@@ -24,4 +21,8 @@ public interface SysOrganizationService extends IService<SysOrganization> {
     HttpResult addTeamUsers(SysOrganizationUserLinkAdd organizationUserLinkAdd);
 
     HttpResult setResponsiblePerson(SysOrganizationSetPerson setPerson);
+
+    HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers);
+
+    HttpResult getDetails(Long userId);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysOrganizationUserLinkService.java

@@ -2,8 +2,12 @@ package com.jzg.organization.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.dto.DeleteAssociatedUsers;
 import com.jzg.commons.entity.po.SysOrganizationUserLink;
 
 public interface SysOrganizationUserLinkService extends IService<SysOrganizationUserLink>{
     boolean selectByOrgId(Long id);
+
+    boolean deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers);
+
 }

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

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.SysOrganizationAdd;
-import com.jzg.commons.entity.dto.SysOrganizationParam;
-import com.jzg.commons.entity.dto.SysOrganizationSetPerson;
-import com.jzg.commons.entity.dto.SysOrganizationUserLinkAdd;
+import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.SysOrganization;
 import com.jzg.commons.entity.po.SysOrganizationUserLink;
 import com.jzg.commons.entity.vo.LeftSysOrganizationVo;
@@ -39,8 +36,11 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
     public HttpResult queryPageList(SysOrganizationParam sysOrganizationParam) {
         QueryWrapper<SysOrganization> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("id, system_code, name, dept_id, manager_id, describe_information, attribute, is_delete, create_by, create_time, update_by, update_time," +
-                "(SELECT COUNT(1) FROM sys_organization_user_link WHERE sys_organization_user_link.organization_id = sys_organization.id) memberNumber");
-        queryWrapper.like("name", sysOrganizationParam.getParam());
+                "(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");
+        if (StringUtils.isNotEmpty(sysOrganizationParam.getParam())){
+            queryWrapper.like("name", sysOrganizationParam.getParam());
+        }
         List<SysOrganization> list = null;
         if (ObjectUtil.isNotEmpty(sysOrganizationParam.getPage())){
             list = sysOrganizationMapper.selectList(sysOrganizationParam.getPage(), queryWrapper);
@@ -114,4 +114,15 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
         }
         return HttpResult.error("所选团队、渠道、电销组不存在或以删除，请刷新");
     }
+
+    @Override
+    public HttpResult deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
+        boolean isDelete = sysOrganizationUserLinkService.deleteAssociatedUsers(deleteAssociatedUsers);
+        return isDelete ? HttpResult.ok("删除成功") : HttpResult.error("删除失败");
+    }
+
+    @Override
+    public HttpResult getDetails(Long userId) {
+        return HttpResult.ok(sysOrganizationMapper.getDetails(userId));
+    }
 }

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

@@ -1,7 +1,9 @@
 package com.jzg.organization.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.dto.DeleteAssociatedUsers;
 import com.jzg.commons.entity.po.SysOrganizationUserLink;
 import com.jzg.organization.mapper.SysOrganizationUserLinkServiceMapper;
 import com.jzg.organization.service.SysOrganizationUserLinkService;
@@ -30,6 +32,14 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
         return false;
     }
 
+    @Override
+    public boolean deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers) {
+        QueryWrapper<SysOrganizationUserLink> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("organization_id",deleteAssociatedUsers.getId());
+        queryWrapper.in("user_id",deleteAssociatedUsers.getUserIds());
+        return sysOrganizationUserLinkServiceMapper.delete(queryWrapper) > 0 ? true : false;
+    }
+
 
     public LambdaQueryWrapper<SysOrganizationUserLink> getWrapper(SysOrganizationUserLink sysOrganizationUserLink) {
         LambdaQueryWrapper<SysOrganizationUserLink> wrapper = new LambdaQueryWrapper<>();