Parcourir la source

Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

yuanliang il y a 1 an
Parent
commit
f88a5c27bb

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMapper.xml

@@ -29,7 +29,7 @@
         left join tenant_info i on r.tenant_id_ = i.id_
         <where>
             <if test="param.name != null and param.name != ''">
-                and t.name_ = #{param.name}
+                and t.name_ like CONCAT('%', #{param.name}, '%')
             </if>
             <if test="param.tenantId != null ">
                 and i.id_= #{param.tenantId}

+ 7 - 1
cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -167,6 +167,11 @@ public class TenantInfoController extends BaseController {
             throw new BizException("请登录");
         }
 
+        TenantStaff staff = tenantStaffService.getByUserId(user.getId());
+        if (Objects.nonNull(staff)) {
+            // 设置用户机构ID
+            user.setTenantId(staff.getTenantId());
+        }
         //如果传手机号
         if (StringUtils.isNotBlank(sysUser.getPhone())) {
 
@@ -252,7 +257,7 @@ public class TenantInfoController extends BaseController {
                     .set(TenantStaff::getUserId, userId)
                     .update();
 
-            // 更新机构信息表中的用户昵称
+            // 更新机构信息表中的用户
             if (Optional.ofNullable(user.getTenantId()).orElse(-1L) > 0) {
 
                 tenantInfoService.lambdaUpdate()
@@ -277,6 +282,7 @@ public class TenantInfoController extends BaseController {
                     .set(TenantStaff::getUpdateTime, LocalDateTime.now())
                     .update();
 
+
             // 更新机构信息表中的用户昵称
             if (StringUtils.isNotBlank(sysUser.getUsername()) && Optional.ofNullable(user.getTenantId()).orElse(-1L) > 0) {