主账号新增部门名称

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

@@ -166,6 +166,10 @@ public class NewPlatformApi {
             String organizationId = userEnterprise.getOrganizationId();
             Organization organization = organizationService.getById(organizationId);
             userEnterprise.setEnterpriseName(organization.getName());
+            OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(userEnterprise.getDepartment());
+            userEnterprise.setDepartment(organizationDepartment.getName());
+            OrganizationDepartmentUser organizationDepartmentUser = organizationDepartmentUserService.getById(userEnterprise.getRealName());
+            userEnterprise.setRealName(organizationDepartmentUser.getName());
             userEnterprise.setIsAuthentication(1);
             userEnterprise.setCreateTime(new Date());
             userEnterpriseService.save(userEnterprise);
@@ -301,6 +305,12 @@ public class NewPlatformApi {
     @RequestMapping(value = "/updataBypassAccount2", method = RequestMethod.POST)
     public CommonResult<String> updataBypassAccount2(@RequestBody @Validated UserBypassAccount userBypassAccount) {
         try {
+            String department = userBypassAccount.getDepartment();
+            String realName = userBypassAccount.getRealName();
+            OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(department);
+            OrganizationDepartmentUser organizationDepartmentUser = organizationDepartmentUserService.getById(realName);
+            userBypassAccount.setDepartment(organizationDepartment.getName());
+            userBypassAccount.setRealName(organizationDepartmentUser.getName());
             userBypassAccountService.updateById(userBypassAccount);
             return CommonResult.success("修改子账号信息成功");
         } catch (Exception e) {
@@ -687,17 +697,17 @@ public class NewPlatformApi {
         return CommonResult.success("操作成功");
     }
 
-//    @ApiOperation(value = "企业关联用户")
-//    @RequestMapping(value = "/associationUser", method = RequestMethod.GET)
-//    public CommonResult<?> associationUser(@RequestParam(name = "id", required = true) String id,
-//                                                     @Validated PageParamRequest pageParamRequest) {
-//        LambdaQueryWrapper<OrganizationDepartmentUser> queryWrapper = new LambdaQueryWrapper<>();
-//        queryWrapper.eq(OrganizationDepartmentUser::getDepartmentId, id);
-//
-//
-//
-//        Page<OrganizationDepartmentUser> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
-//        return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(page, list)));
-//
-//    }
+    @ApiOperation(value = "查看子用户信息根据企业用户id和用户id")
+    @RequestMapping(value = "/selectBypassByUserId", method = RequestMethod.GET)
+    public CommonResult<?> selectBypassByUserId(@RequestParam(name = "id", required = true) String id,
+                                       @RequestParam(name = "userId", required = true) String userId
+    ) {
+        LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserBypassAccount::getUserId,userId);
+        queryWrapper.eq(UserBypassAccount::getEnterpriseId,id);
+        UserBypassAccount one = userBypassAccountService.getOne(queryWrapper);
+        return CommonResult.success(one);
+    }
+
+
 }

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

@@ -46,6 +46,9 @@ public class UserEnterprise implements Serializable {
     @ApiModelProperty(value = "真实姓名")
     private String realName;
 
+    @ApiModelProperty(value = "部门名称")
+    private String department;
+
     @ApiModelProperty(value = "用户昵称")
     private String nickname;
 

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

@@ -184,7 +184,7 @@ public class LoginServiceImpl implements LoginService {
         registerThirdUserRequest.setType(UserConstants.REGISTER_TYPE_WECHAT);
         registerThirdUserRequest.setOpenId(oauthToken.getOpenId());
         String key = SecureUtil.md5(oauthToken.getOpenId());
-        redisUtil.set(key, JSONObject.toJSONString(registerThirdUserRequest), (long) (60 * 2), TimeUnit.MINUTES);
+        redisUtil.set(key, JSONObject.toJSONString(registerThirdUserRequest), 0L, TimeUnit.MINUTES);
 
         loginResponse.setType(LoginConstants.LOGIN_STATUS_REGISTER);
         loginResponse.setKey(key);
@@ -461,7 +461,7 @@ public class LoginServiceImpl implements LoginService {
         registerThirdUserRequest.setType(request.getType());
         registerThirdUserRequest.setOpenId(request.getOpenId());
         String key = SecureUtil.md5(request.getOpenId());
-        redisUtil.set(key, JSONObject.toJSONString(registerThirdUserRequest), (long) (60 * 2), TimeUnit.MINUTES);
+        redisUtil.set(key, JSONObject.toJSONString(registerThirdUserRequest), (long) 0, TimeUnit.MINUTES);
         LoginResponse loginResponse = new LoginResponse();
         loginResponse.setType(LoginConstants.LOGIN_STATUS_REGISTER);
         loginResponse.setKey(key);