| @@ -67,6 +67,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { | |||||
| //设置userId到request里,后续根据userId,获取用户信息 | //设置userId到request里,后续根据userId,获取用户信息 | ||||
| request.setAttribute(Constant.LOGIN_USER_KEY, wxBuser.getId()); | request.setAttribute(Constant.LOGIN_USER_KEY, wxBuser.getId()); | ||||
| request.setAttribute(Constant.TENANT_ID, wxBuser.getTenantId()); | request.setAttribute(Constant.TENANT_ID, wxBuser.getTenantId()); | ||||
| if (StringUtils.isNotBlank(wxBuser.getParentTenantId())) { | |||||
| request.setAttribute(Constant.PARENT_TENANT_ID, wxBuser.getParentTenantId()); | |||||
| } | |||||
| //如果是要不需要自动设置tenantI信息 | //如果是要不需要自动设置tenantI信息 | ||||
| @@ -278,7 +278,7 @@ | |||||
| </select> | </select> | ||||
| <update id="insertBillAction"> | <update id="insertBillAction"> | ||||
| insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id) | |||||
| insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id,parent_tenant_id) | |||||
| select | select | ||||
| (select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)) id | (select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)) id | ||||
| ,'系统端' user_name,7 `action`,b.id bill_id, | ,'系统端' user_name,7 `action`,b.id bill_id, | ||||
| @@ -292,7 +292,7 @@ | |||||
| b.owe * (c.late_pay_ratio) /10000 | b.owe * (c.late_pay_ratio) /10000 | ||||
| ,2) | ,2) | ||||
| ) | ) | ||||
| ,'元') details,b.tenant_id | |||||
| ,'元') details,b.tenant_id,b.parent_tenant_id | |||||
| from wx_bill_property b left join wx_property_contract c on(b.`property_contract_id`=c.id) | from wx_bill_property b left join wx_property_contract c on(b.`property_contract_id`=c.id) | ||||
| where c.late_pay_ratio >0 | where c.late_pay_ratio >0 | ||||
| and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 | and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 | ||||
| @@ -279,7 +279,7 @@ | |||||
| </select> | </select> | ||||
| <update id="insertBillAction"> | <update id="insertBillAction"> | ||||
| insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id) | |||||
| insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id,parent_tenant_id) | |||||
| select | select | ||||
| (select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)+ CEILING(RAND()*90000+10000) ) id | (select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)+ CEILING(RAND()*90000+10000) ) id | ||||
| ,'系统端' user_name,7 `action`,b.id bill_id, | ,'系统端' user_name,7 `action`,b.id bill_id, | ||||
| @@ -293,7 +293,7 @@ | |||||
| b.owe * (c.late_pay_ratio) /10000 | b.owe * (c.late_pay_ratio) /10000 | ||||
| ,2) | ,2) | ||||
| ) | ) | ||||
| ,'元') details,b.tenant_id | |||||
| ,'元') details,b.tenant_id,b.parent_tenant_id | |||||
| from wx_bill_rent b left join wx_rent_contract c on(b.rent_contract_id=c.id) | from wx_bill_rent b left join wx_rent_contract c on(b.rent_contract_id=c.id) | ||||
| where c.late_pay_ratio >0 | where c.late_pay_ratio >0 | ||||
| and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 | and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 | ||||