mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
mx 2024-10-31 11:45:20 +08:00
parent 9272f9a890
commit 822cf45ccd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java
View File

@ -147,7 +147,7 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService {
sql.append("and business_type = '2' and is_proxy = '2'");
}
lqw.exists(bo.getType() != 1, sql.toString());
lqw.orderByDesc("task.finish_date");
lqw.orderByDesc("finish_date");
// lqw.groupBy("com.id");
Page<PsCompanyInfoVo> result = baseMapper.selectPageList2(pageQuery.build(), lqw);
if (!result.getRecords().isEmpty()){

4
pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml
View File

@ -82,13 +82,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
usr.nick_name fu_nick_name,
app1.id app_id,
app1.apply_desc app_apply_desc,
app1.approver_status app_approver_status
app1.approver_status app_approver_status,
(select max(finish_date) FROM ps_task_main task where task.service_company_id = com.id and task.del_flag = 0 ) finish_date
from ps_company_info com
left join ps_custom_info cus on com.custom_id = cus.id
left join ps_custom_info cusi on cus.custom_introducer = cusi.id
left join ps_company_follow cf on com.id = cf.company_id
left join sys_user usr on cf.user_id = usr.user_id
inner join ps_task_main task on task.service_company_id = com.id and task.del_flag = 0
left join (
SELECT business_id, max(apply_date) max_apply_date
FROM ps_approver_record

2
pusong-modules/pusong-system/src/main/java/com/pusong/system/service/impl/SysUserServiceImpl.java
View File

@ -130,7 +130,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
.eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
.eq(ObjectUtil.isNotNull(user.getRoleKey()), "r.role_key", user.getRoleKey().split(","))
.in(ObjectUtil.isNotNull(user.getRoleKey()), "r.role_key", user.getRoleKey().split(","))
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())

2
script/sql/after.sql
View File

@ -7,6 +7,6 @@ alter table sys_user add `openid` varchar(30) comment '微信openid';
alter table ps_custom_info add `service_type` varchar(200) comment '服务类别';
alter table sys_notice add `rec_role` bigint(20) comment '接收角色';
alter table sys_notice add `rec_role` varchar(200) comment '接收角色';
alter table sys_notice add `rec_uid` bigint(20) comment '接收用户';
alter table sys_notice add `jump_type` int(2) comment '跳转类型';