组织机构信息关联

crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -244,6 +244,7 @@ public class NewPlatformApi {
             userBypassAccount.setId(byId.getId());
             userBypassAccount.setCreateTime(new Date());
             userBypassAccount.setIsDelete(0);
+            userBypassAccount.setDepartmentId(userBypassAccount.getDepartment());
             String realName = userBypassAccount.getRealName();
             OrganizationDepartmentUser organizationDepartmentUser = organizationDepartmentUserService.getById(realName);
             userBypassAccount.setRealName(organizationDepartmentUser.getName());
@@ -628,12 +629,7 @@ public class NewPlatformApi {
     }
 
 
-    @ApiOperation(value = "平台端组织机构编辑")
-    @RequestMapping(value = "/organizationEdit", method = RequestMethod.POST)
-    public CommonResult<String> organizationEdit(@RequestBody @Validated OrganizationVO request) {
-        organizationService.updateMain(request);
-        return CommonResult.success("操作成功");
-    }
+
 
     /**
      * 通过id查询
@@ -710,4 +706,39 @@ public class NewPlatformApi {
     }
 
 
+    @ApiOperation(value = "平台端组织机构编辑-部门")
+    @RequestMapping(value = "/organizationDepartEdit", method = RequestMethod.POST)
+    public CommonResult<String> organizationDepartEdit(@RequestBody @Validated OrganizationDepartment request) {
+        organizationDepartmentService.organizationDepartEdit(request);
+
+        return CommonResult.success("操作成功");
+    }
+
+    @ApiOperation(value = "平台端组织机构编辑-用户")
+    @RequestMapping(value = "/organizationUserEdit", method = RequestMethod.POST)
+    public CommonResult<String> organizationUserEdit(@RequestBody @Validated OrganizationDepartmentUser request) {
+        String username = request.getName();
+        LambdaQueryWrapper<UserBypassAccount> userBypassAccountLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        userBypassAccountLambdaQueryWrapper.eq(UserBypassAccount::getRealName,username);
+        List<UserBypassAccount> list = userBypassAccountService.list(userBypassAccountLambdaQueryWrapper);
+        if (null!=list&&list.size()>0){
+            for (UserBypassAccount userBypassAccount : list) {
+                String name = request.getName();
+                userBypassAccount.setRealName(name);
+                userBypassAccountService.updateById(userBypassAccount);
+            }
+        }
+        organizationDepartmentUserService.updateById(request);
+        return CommonResult.success("操作成功");
+    }
+
+    @ApiOperation(value = "平台端组织机构编辑")
+    @RequestMapping(value = "/organizationEdit", method = RequestMethod.POST)
+    public CommonResult<String> organizationEdit(@RequestBody @Validated OrganizationVO request) {
+
+        organizationService.updateMain(request);
+        return CommonResult.success("操作成功");
+    }
+
+
 }

crmeb-common/src/main/java/com/zbkj/common/model/user/UserBypassAccount.java

@@ -63,4 +63,7 @@ public class UserBypassAccount implements Serializable {
 
     @ApiModelProperty(value = "是否查看主账号所有订单 1是 2否")
     private Integer isAllOrders;
+
+    @ApiModelProperty(value = "部门id")
+    private String departmentId;
 }

crmeb-service/src/main/java/com/zbkj/service/dao/OrganizationDeparementDao.java

@@ -14,4 +14,6 @@ public interface OrganizationDeparementDao extends BaseMapper<OrganizationDepart
     List<OrganizationDepartmentVO> selectMain(@Param("id") String id);
 
     List<OrganizationDepartment> selectMainById(@Param("id")String id);
+
+
 }

crmeb-service/src/main/java/com/zbkj/service/dao/UserBypassAccountDao.java

@@ -3,9 +3,11 @@ package com.zbkj.service.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zbkj.common.model.user.UserBypassAccount;
 import com.zbkj.common.model.user.UserEnterprise;
+import org.apache.ibatis.annotations.Param;
 
 
 public interface UserBypassAccountDao extends BaseMapper<UserBypassAccount> {
 
 
+    UserBypassAccount selectDapartByMainIdAndName(@Param("organizationId") String organizationId, @Param("name") String name);
 }

crmeb-service/src/main/java/com/zbkj/service/dao/UserEnterpriseDao.java

@@ -12,4 +12,5 @@ import java.util.Map;
 public interface UserEnterpriseDao extends BaseMapper<UserEnterprise> {
 
 
+    List<UserEnterprise>  selectByOrganId(String id);
 }

crmeb-service/src/main/java/com/zbkj/service/service/OrganizationDepartmentService.java

@@ -17,4 +17,7 @@ public interface OrganizationDepartmentService extends IService<OrganizationDepa
     List<OrganizationDepartmentVO> selectMain(String id);
 
     List<OrganizationDepartment> selectMainById(String id);
+
+    void organizationDepartEdit(OrganizationDepartment request);
+
 }

crmeb-service/src/main/java/com/zbkj/service/service/UserEnterpriseService.java

@@ -14,4 +14,5 @@ import java.util.Map;
 
 public interface UserEnterpriseService extends IService<UserEnterprise> {
 
+    List<UserEnterprise>  selectByOrganId(String id);
 }

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrganizationDepartmentServiceImpl.java

@@ -2,14 +2,20 @@ package com.zbkj.service.service.impl;
 
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.zbkj.common.model.organization.OrganizationDepartment;
 
 import com.zbkj.common.model.organization.VO.OrganizationDepartmentVO;
+import com.zbkj.common.model.user.UserBypassAccount;
+import com.zbkj.common.model.user.UserEnterprise;
 import com.zbkj.service.dao.OrganizationDeparementDao;
+import com.zbkj.service.dao.UserBypassAccountDao;
+import com.zbkj.service.dao.UserEnterpriseDao;
 import com.zbkj.service.service.OrganizationDepartmentService;
 
+import com.zbkj.service.service.UserBypassAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +27,12 @@ public class OrganizationDepartmentServiceImpl extends ServiceImpl<OrganizationD
 
     @Autowired
     private OrganizationDeparementDao deparementDao;
+    @Autowired
+    private UserBypassAccountDao userBypassAccountDao;
+    @Autowired
+    private UserEnterpriseDao userEnterpriseDao;
+    @Autowired
+    private UserBypassAccountService userBypassAccountService;
 
     @Override
     public List<OrganizationDepartmentVO> selectMain(String id) {
@@ -31,5 +43,18 @@ public class OrganizationDepartmentServiceImpl extends ServiceImpl<OrganizationD
     public List<OrganizationDepartment> selectMainById(String id) {
         return deparementDao.selectMainById(id);
     }
+
+    @Override
+    public void organizationDepartEdit(OrganizationDepartment request) {
+        deparementDao.updateById(request);
+
+        String id = request.getId();
+        LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserBypassAccount::getDepartmentId,id);
+        UserBypassAccount userBypassAccount = userBypassAccountService.getOne(queryWrapper);
+        userBypassAccount.setDepartment(request.getName());
+        userBypassAccountService.updateById(userBypassAccount);
+
+    }
 }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrganizationServiceImpl.java

@@ -8,12 +8,14 @@ import com.zbkj.common.model.organization.OrganizationDepartment;
 import com.zbkj.common.model.organization.OrganizationDepartmentUser;
 import com.zbkj.common.model.organization.VO.OrganizationDepartmentVO;
 import com.zbkj.common.model.organization.VO.OrganizationVO;
+import com.zbkj.common.model.user.UserEnterprise;
 import com.zbkj.service.dao.OrganizationDao;
 import com.zbkj.service.dao.OrganizationDeparementDao;
 import com.zbkj.service.dao.OrganizationDeparementUserDao;
 import com.zbkj.service.service.OrganizationDepartmentService;
 import com.zbkj.service.service.OrganizationDepartmentUserService;
 import com.zbkj.service.service.OrganizationService;
+import com.zbkj.service.service.UserEnterpriseService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,6 +39,8 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, Organi
     private OrganizationDepartmentService organizationDepartmentService;
     @Autowired
     private OrganizationDepartmentUserService organizationDepartmentUserService;
+    @Autowired
+    private UserEnterpriseService userEnterpriseService;
 
     @Override
     public void saveMain(OrganizationVO request, SystemAdmin systemAdmin) {
@@ -89,6 +93,16 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, Organi
         Organization organization = new Organization();
         BeanUtils.copyProperties(request, organization);
         this.updateById(organization);
+        List<UserEnterprise> userEnterprises= userEnterpriseService.selectByOrganId(id);
+        if (null!=userEnterprises&&userEnterprises.size()>0){
+            for (UserEnterprise userEnterpris : userEnterprises) {
+                String name = request.getName();
+                userEnterpris.setEnterpriseName(name);
+                userEnterpriseService.updateById(userEnterpris);
+            }
+
+        }
+
 
 
         List<OrganizationDepartmentVO> department = request.getChildren();

crmeb-service/src/main/java/com/zbkj/service/service/impl/UserEnterpriseServiceImpl.java

@@ -8,12 +8,20 @@ import com.zbkj.common.model.user.UserEnterprise;
 import com.zbkj.service.dao.UserEnterpriseDao;
 import com.zbkj.service.service.*;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 
 
 @Service
 public class UserEnterpriseServiceImpl extends ServiceImpl<UserEnterpriseDao, UserEnterprise> implements UserEnterpriseService {
 
+    @Autowired
+    private UserEnterpriseDao userEnterpriseDao;
 
+    @Override
+    public List<UserEnterprise> selectByOrganId(String id) {
+        return userEnterpriseDao.selectByOrganId(id);
+    }
 }

crmeb-service/src/main/resources/mapper/user/UserBypassAccountMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zbkj.service.dao.UserBypassAccountDao">
 
+<select id="selectDapartByMainIdAndName" parameterType="java.lang.String" resultType="com.zbkj.common.model.user.UserBypassAccount">
+
+    </select>
 </mapper>

crmeb-service/src/main/resources/mapper/user/UserEnterpriseMapper.xml

@@ -2,4 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zbkj.service.dao.UserEnterpriseDao">
 
+<select id="selectByOrganId" parameterType="java.lang.String" resultType="com.zbkj.common.model.user.UserEnterprise">
+    select * from eb_user_enterprise where organization_id= #{id}  </select>
 </mapper>