|
@@ -643,20 +643,23 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
if(esmUserReferrer != null){
|
|
if(esmUserReferrer != null){
|
|
|
SysUser referrerUser = sysUserService.findByUserId(esmUserReferrer.getReferrerId());
|
|
SysUser referrerUser = sysUserService.findByUserId(esmUserReferrer.getReferrerId());
|
|
|
SysUserInfo referrerSysUserInfo = sysUserInfoService.getById(esmUserReferrer.getReferrerId());
|
|
SysUserInfo referrerSysUserInfo = sysUserInfoService.getById(esmUserReferrer.getReferrerId());
|
|
|
- if(referrerSysUserInfo != null) {
|
|
|
|
|
- if ("M".equals(referrerSysUserInfo.getSex())) {
|
|
|
|
|
- orderAndAreaCompany.setReferrerSex("男");
|
|
|
|
|
- } else {
|
|
|
|
|
- orderAndAreaCompany.setReferrerSex("女");
|
|
|
|
|
|
|
+ //处理空指针报错
|
|
|
|
|
+ if(referrerUser != null){
|
|
|
|
|
+ if(referrerSysUserInfo != null) {
|
|
|
|
|
+ if ("M".equals(referrerSysUserInfo.getSex())) {
|
|
|
|
|
+ orderAndAreaCompany.setReferrerSex("男");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ orderAndAreaCompany.setReferrerSex("女");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+ orderAndAreaCompany.setReferrerMobile(referrerUser.getMobile());
|
|
|
|
|
+ orderAndAreaCompany.setReferrerNo(referrerUser.getId());
|
|
|
|
|
+ orderAndAreaCompany.setReferrerName(referrerUser.getName());
|
|
|
|
|
+ orderAndAreaCompany.setReferrerDeptId(referrerUser.getDeptId());
|
|
|
|
|
+ SysDept sysDept = sysDeptService.getById(referrerUser.getDeptId());
|
|
|
|
|
+ orderAndAreaCompany.setReferrerDeptName(sysDept!=null?sysDept.getName():null);
|
|
|
|
|
+ orderAndAreaCompany.setReferrerDeptAreaInfo(sysDeptService.queryBelongArea(referrerUser.getDeptId()));
|
|
|
}
|
|
}
|
|
|
- orderAndAreaCompany.setReferrerMobile(referrerUser.getMobile());
|
|
|
|
|
- orderAndAreaCompany.setReferrerNo(referrerUser.getId());
|
|
|
|
|
- orderAndAreaCompany.setReferrerName(referrerUser.getName());
|
|
|
|
|
- orderAndAreaCompany.setReferrerDeptId(referrerUser.getDeptId());
|
|
|
|
|
- SysDept sysDept = sysDeptService.getById(referrerUser.getDeptId());
|
|
|
|
|
- orderAndAreaCompany.setReferrerDeptName(sysDept!=null?sysDept.getName():null);
|
|
|
|
|
- orderAndAreaCompany.setReferrerDeptAreaInfo(sysDeptService.queryBelongArea(referrerUser.getDeptId()));
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//计算今年应缴税
|
|
//计算今年应缴税
|