关联子账号修改

企业用户个人信息页修改

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

@@ -237,6 +237,17 @@ public class NewPlatformApi {
             User byId = userService.getById(userBypassAccount.getUserId());
             userBypassAccount.setAccount(byId.getAccount());
             userBypassAccount.setPhone(byId.getPhone());
+            userBypassAccount.setId(byId.getId());
+            userBypassAccount.setCreateTime(new Date());
+            userBypassAccount.setIsDelete(0);
+            String realName = userBypassAccount.getRealName();
+            OrganizationDepartmentUser organizationDepartmentUser = organizationDepartmentUserService.getById(realName);
+            userBypassAccount.setRealName(organizationDepartmentUser.getName());
+            String department = userBypassAccount.getDepartment();
+            OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(department);
+            userBypassAccount.setDepartment(organizationDepartment.getName());
+
+
             LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(UserBypassAccount::getUserId, userBypassAccount.getUserId());
             queryWrapper.eq(UserBypassAccount::getIsDelete, 0);

crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.zbkj.common.constants.Constants;
@@ -39,7 +40,6 @@ import java.util.stream.Collectors;
 
 /**
  * 用户中心 服务实现类
-
  */
 @Service
 public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements UserCenterService {
@@ -82,10 +82,13 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
     private OrganizationService organizationService;
     @Autowired
     private OrganizationDepartmentService organizationDepartmentService;
+    @Autowired
+    private UserBypassAccountService userBypassAccountService;
 
 
     /**
      * 获取个人中心详情
+     *
      * @return 个人中心数据
      */
     @Override
@@ -127,20 +130,22 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
             response.setIsPromoter(true);
         }
         //企业用户获取企业以及部门
-        Integer isEnterpriseUser = user.getIsEnterpriseUser();
-        if (null==isEnterpriseUser||1==isEnterpriseUser){
+        LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserBypassAccount::getUserId, uid);
+        UserBypassAccount one = userBypassAccountService.getOne(queryWrapper);
+        if (null!=one){
+            response.setQyName("");
+            response.setBmName(one.getDepartment());
+            response.setRealName(one.getRealName());
+        }else{
             response.setQyName("");
             response.setBmName("");
             response.setRealName("");
-        }else{
-            OrganizationDepartmentUser organizationDepartmentUser= organizationDepartmentUserService.selectIdByUserId(user.getId());
-            Organization organization = organizationService.getById(organizationDepartmentUser.getOrganizationId());
-            OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(organizationDepartmentUser.getDepartmentId());
-            response.setQyName(organization.getName());
-            response.setBmName(organizationDepartment.getName());
-            response.setRealName(user.getRealName());
         }
 
+
+
+
         // 保存用户访问记录
         asyncService.visitUserCenter(user.getId());
         return response;
@@ -243,6 +248,7 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
 
     /**
      * 会员等级列表
+     *
      * @return List<UserLevel>
      */
     @Override
@@ -286,6 +292,7 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
 
     /**
      * 我的账户
+     *
      * @return UserMyAccountResponse
      */
     @Override
@@ -313,7 +320,8 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
 
     /**
      * 用户余额记录
-     * @param recordType 记录类型：all-全部，expenditure-支出，income-收入，recharge-充值
+     *
+     * @param recordType  记录类型：all-全部，expenditure-支出，income-收入，recharge-充值
      * @param pageRequest 分页参数
      * @return PageInfo
      */
@@ -957,6 +965,7 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
 
     /**
      * 用户积分记录列表
+     *
      * @param pageParamRequest 分页参数
      * @return PageInfo<UserIntegralRecord>
      */
@@ -1051,6 +1060,7 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
 
     /**
      * 获取用户经验记录
+     *
      * @param pageParamRequest 分页参数
      * @return List<UserExperienceRecord>
      */
@@ -1070,6 +1080,7 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
 
     /**
      * 获取用户浏览足迹
+     *
      * @return 用户浏览足迹
      */
     @Override

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

@@ -7,4 +7,5 @@ import com.zbkj.common.model.user.UserEnterprise;
 
 public interface UserBypassAccountService extends IService<UserBypassAccount> {
 
+
 }

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

@@ -1,15 +1,21 @@
 package com.zbkj.service.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.zbkj.common.model.user.UserBypassAccount;
+import com.zbkj.common.model.user.UserEnterprise;
 import com.zbkj.service.dao.UserBypassAccountDao;
 import com.zbkj.service.service.UserBypassAccountService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service
 public class UserBypassAccountServiceImpl extends ServiceImpl<UserBypassAccountDao, UserBypassAccount> implements UserBypassAccountService {
 
-
 }