@@ -583,6 +583,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
String.format("包含[%s]或[%s]角色的用户,请先联系管理员在用户管理中绑定该用户所管辖的供应商.", RoleTypeEnum.THIRD_PMO.getDesc(),
RoleTypeEnum.DEVICE_DELIVERY.getDesc()));
}
+ dto.setSupplierId(supplierId);
return dto;
@@ -64,7 +64,7 @@
t_b_user_archives_allocation tbuaa
LEFT JOIN t_b_user_archives_supplier tbuas ON tbuaa.archives_id = tbuas.user_archives_id
WHERE
- tbuas.supplier_id = #{dpr.supplierId} AND tbuaa.service_id = a.service_id)
+ tbuas.supplier_id = #{dpr.supplierId} AND tbuaa.crm_no = a.crm_no)
</when>
<otherwise>
<choose>
@@ -87,7 +87,7 @@
- tbuas.supplier_id = #{dpr.supplierId} AND tbuaa.service_id = tbs.id)
+ tbuas.supplier_id = #{dpr.supplierId} AND tbuaa.crm_no = tbpe.crm_no)
@@ -71,7 +71,7 @@
@@ -115,7 +115,7 @@
+ tbuas.supplier_id = #{dpr.supplierId} AND tbuaa.crm_no = tbsi.crm_no)
@@ -62,7 +62,7 @@