rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 调整代理商创建人和修改人

This commit is contained in:
曹鹏飞 2025-02-24 10:55:06 +08:00
parent 66dacadacd
commit 441d843573
6 changed files with 46 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUser.java
View File

@ -101,9 +101,9 @@ public class AppUser implements Serializable {
private String languageCode; private String languageCode;
/** /**
* 创建人id * 创建人
*/ */
private Integer createBy; private String createBy;
/** /**
* 创建时间 * 创建时间
@ -111,9 +111,9 @@ public class AppUser implements Serializable {
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新人id * 更新人
*/ */
private Integer updateBy; private String updateBy;
/** /**
* 最后更新时间 * 最后更新时间

8
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AppUserApplyfor.java
View File

@ -95,9 +95,9 @@ public class AppUserApplyfor implements Serializable {
private String salesUserName; private String salesUserName;
/** /**
* 创建人id * 创建人
*/ */
private Integer createBy; private String createBy;
/** /**
* 创建时间 * 创建时间
@ -105,9 +105,9 @@ public class AppUserApplyfor implements Serializable {
private LocalDateTime createTime; private LocalDateTime createTime;
/** /**
* 更新人id * 更新人
*/ */
private Integer updateBy; private String updateBy;
/** /**
* 最后更新时间 * 最后更新时间

10
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
View File

@ -79,7 +79,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
.setCompanyId(request.getCompanyId()) .setCompanyId(request.getCompanyId())
.setTitleId(request.getTitleId()) .setTitleId(request.getTitleId())
.setType(AppUserApplyforType.ADD.getState().byteValue()) .setType(AppUserApplyforType.ADD.getState().byteValue())
.setCreateBy(AppUserUtil.getUserId()) .setCreateBy(AppUserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
save(applyfor); save(applyfor);
return applyfor; return applyfor;
@ -92,7 +92,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
.setReason(request.getReason()) .setReason(request.getReason())
.setState(AppUserApplyForState.PENDINGAPPROVAL.getState().byteValue()) .setState(AppUserApplyForState.PENDINGAPPROVAL.getState().byteValue())
.setType(AppUserApplyforType.ENABLE.getState().byteValue()) .setType(AppUserApplyforType.ENABLE.getState().byteValue())
.setCreateBy(AppUserUtil.getUserId()) .setCreateBy(AppUserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
save(applyfor); save(applyfor);
return applyfor; return applyfor;
@ -105,7 +105,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
.setReason(request.getReason()) .setReason(request.getReason())
.setState(AppUserApplyForState.PENDINGAPPROVAL.getState().byteValue()) .setState(AppUserApplyForState.PENDINGAPPROVAL.getState().byteValue())
.setType(AppUserApplyforType.EXTENSION.getState().byteValue()) .setType(AppUserApplyforType.EXTENSION.getState().byteValue())
.setCreateBy(AppUserUtil.getUserId()) .setCreateBy(AppUserUtil.getUserName())
.setCreateTime(LocalDateTime.now()); .setCreateTime(LocalDateTime.now());
save(applyfor); save(applyfor);
return applyfor; return applyfor;
@ -205,12 +205,12 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
appUserService.updateById(appUser); appUserService.updateById(appUser);
} }
applyfor.setState(AppUserApplyForState.APPROVED.getState().byteValue()) applyfor.setState(AppUserApplyForState.APPROVED.getState().byteValue())
.setUpdateBy(AdminUserUtil.getUserId()) .setUpdateBy(AdminUserUtil.getUserName())
.setUpdateTime(LocalDateTime.now()); .setUpdateTime(LocalDateTime.now());
updateById(applyfor); updateById(applyfor);
} else { } else {
applyfor.setState(AppUserApplyForState.REJECT.getState().byteValue()) applyfor.setState(AppUserApplyForState.REJECT.getState().byteValue())
.setUpdateBy(AdminUserUtil.getUserId()) .setUpdateBy(AdminUserUtil.getUserName())
.setUpdateTime(LocalDateTime.now()); .setUpdateTime(LocalDateTime.now());
updateById(applyfor); updateById(applyfor);
} }

46
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.nflg.mobilebroken.common.pojo.vo.AppUserForAdminVO;
import com.nflg.mobilebroken.common.pojo.vo.AppUserVO; import com.nflg.mobilebroken.common.pojo.vo.AppUserVO;
import com.nflg.mobilebroken.common.pojo.vo.AreaSimpleVO; import com.nflg.mobilebroken.common.pojo.vo.AreaSimpleVO;
import com.nflg.mobilebroken.common.pojo.vo.CompanyVO; import com.nflg.mobilebroken.common.pojo.vo.CompanyVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.AppUserUtil; import com.nflg.mobilebroken.common.util.AppUserUtil;
import com.nflg.mobilebroken.common.util.PageUtil; import com.nflg.mobilebroken.common.util.PageUtil;
import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.common.util.VUtils;
@ -58,9 +59,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
@Resource @Resource
private ITBaseCustomerService customerService; private ITBaseCustomerService customerService;
@Resource
private IAdminUserService adminUserService;
@Resource @Resource
private ITBasePositionService positionService; private ITBasePositionService positionService;
@ -86,7 +84,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
public void disable(Integer id) { public void disable(Integer id) {
AppUser user=new AppUser() AppUser user=new AppUser()
.setState(UserState.Disabled.getState()) .setState(UserState.Disabled.getState())
.setUpdateBy(AppUserUtil.getUserId()) .setUpdateBy(AppUserUtil.getUserName())
.setUpdateTime(LocalDateTime.now()) .setUpdateTime(LocalDateTime.now())
.setId(id); .setId(id);
updateById(user); updateById(user);
@ -128,7 +126,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
@Override @Override
public void updatePassword(Integer userId, String password) { public void updatePassword(Integer userId, String password) {
AppUser user=getById(userId); AppUser user=getById(userId);
user.setPassword(PASSWORDENCODER.encode(password)).setUpdateBy(userId).setUpdateTime(LocalDateTime.now()); user.setPassword(PASSWORDENCODER.encode(password)).setUpdateBy(user.getName()).setUpdateTime(LocalDateTime.now());
updateById(user); updateById(user);
} }
@ -171,7 +169,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.setIsPrimary(true) .setIsPrimary(true)
.setLanguageCode(request.getLanguageCode()) .setLanguageCode(request.getLanguageCode())
.setSalesUserName(request.getSalesUserName()) .setSalesUserName(request.getSalesUserName())
// .setCreateBy(AdminUserUtil.getUserId()) .setCreateBy(AdminUserUtil.getUserName())
.setCreateTime(LocalDateTime.now()) .setCreateTime(LocalDateTime.now())
.setState(UserState.ToBeActivated.getState()) .setState(UserState.ToBeActivated.getState())
.setExpireTime(LocalDateTime.of(LocalDateTime.now().getYear(), 12, 31, 8, 0, 0).toLocalDate()); .setExpireTime(LocalDateTime.of(LocalDateTime.now().getYear(), 12, 31, 8, 0, 0).toLocalDate());
@ -307,22 +305,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.page(new Page<>(request.getPage(), request.getPageSize())); .page(new Page<>(request.getPage(), request.getPageSize()));
return PageUtil.convert(page, d -> { return PageUtil.convert(page, d -> {
TBaseArea area = adminAreaService.getById(d.getAreaId()); TBaseArea area = adminAreaService.getById(d.getAreaId());
String createBy = "";
if (d.getIsPrimary()) {
if (Objects.nonNull(d.getCreateBy())) {
AdminUser adminUser = adminUserService.getById(d.getCreateBy());
if (Objects.nonNull(adminUser)) {
createBy = adminUser.getUserName();
}
}
} else {
AppUser appUser = getById(d.getCreateBy());
createBy = appUser.getName();
}
String updateBy = null;
if (Objects.nonNull(d.getUpdateBy())) {
updateBy = getById(d.getUpdateBy()).getName();
}
List<Integer> companyIds = Arrays.stream(d.getCompanyId().split(",")).filter(StrUtil::isNotBlank).map(Integer::valueOf).collect(Collectors.toList()); List<Integer> companyIds = Arrays.stream(d.getCompanyId().split(",")).filter(StrUtil::isNotBlank).map(Integer::valueOf).collect(Collectors.toList());
List<String> customers = customerService.listByIds(companyIds).stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList()); List<String> customers = customerService.listByIds(companyIds).stream().map(TBaseCustomer::getAgencyCompanyName).collect(Collectors.toList());
TBasePosition title = null; TBasePosition title = null;
@ -346,9 +328,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.setAreaName(area.getAreaName()) .setAreaName(area.getAreaName())
.setUserState(d.getState()) .setUserState(d.getState())
.setExpireTime(d.getExpireTime()) .setExpireTime(d.getExpireTime())
.setCreateBy(createBy) .setCreateBy(d.getCreateBy())
.setCreateTime(d.getCreateTime()) .setCreateTime(d.getCreateTime())
.setUpdateBy(updateBy) .setUpdateBy(d.getUpdateBy())
.setPrimary(true) .setPrimary(true)
.setState(d.getExpireTime().isAfter(ChronoLocalDate.from(LocalDateTime.now())) ? 1 : 2) .setState(d.getExpireTime().isAfter(ChronoLocalDate.from(LocalDateTime.now())) ? 1 : 2)
.setLastLoginTime(d.getLastLoginTime()) .setLastLoginTime(d.getLastLoginTime())
@ -363,6 +345,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
if (request.getEnable()) { if (request.getEnable()) {
lambdaUpdate() lambdaUpdate()
.set(AppUser::getState, UserState.Activated.getState()) .set(AppUser::getState, UserState.Activated.getState())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserId())
.set(AppUser::getUpdateTime, LocalDateTime.now()) .set(AppUser::getUpdateTime, LocalDateTime.now())
.eq(AppUser::getIsDel, false) .eq(AppUser::getIsDel, false)
.in(AppUser::getId, request.getIds()) .in(AppUser::getId, request.getIds())
@ -370,6 +353,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
} else { } else {
lambdaUpdate() lambdaUpdate()
.set(AppUser::getState, UserState.Disabled.getState()) .set(AppUser::getState, UserState.Disabled.getState())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserId())
.set(AppUser::getUpdateTime, LocalDateTime.now()) .set(AppUser::getUpdateTime, LocalDateTime.now())
.eq(AppUser::getIsDel, false) .eq(AppUser::getIsDel, false)
.in(AppUser::getId, request.getIds()) .in(AppUser::getId, request.getIds())
@ -380,8 +364,10 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.filter(AppUser::getIsPrimary) .filter(AppUser::getIsPrimary)
.flatMap(u -> Arrays.stream(u.getCompanyId().split(","))) .flatMap(u -> Arrays.stream(u.getCompanyId().split(",")))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(companyIds)) {
lambdaUpdate() lambdaUpdate()
.set(AppUser::getState, UserState.Disabled.getState()) .set(AppUser::getState, UserState.Disabled.getState())
.set(AppUser::getUpdateBy, AdminUserUtil.getUserId())
.set(AppUser::getUpdateTime, LocalDateTime.now()) .set(AppUser::getUpdateTime, LocalDateTime.now())
.eq(AppUser::getIsDel, false) .eq(AppUser::getIsDel, false)
.eq(AppUser::getIsPrimary, false) .eq(AppUser::getIsPrimary, false)
@ -389,6 +375,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.update(); .update();
} }
} }
}
@Override @Override
public List<AppUserForAdminVO> getChildrenOfAppUser(Integer id) { public List<AppUserForAdminVO> getChildrenOfAppUser(Integer id) {
@ -409,11 +396,6 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
if (Objects.nonNull(d.getAreaId())) { if (Objects.nonNull(d.getAreaId())) {
areaName = appAreaService.getById(d.getAreaId()).getName(); areaName = appAreaService.getById(d.getAreaId()).getName();
} }
AppUser createUser = getById(d.getCreateBy());
String updateBy = null;
if (Objects.nonNull(d.getUpdateBy())) {
updateBy = getById(d.getUpdateBy()).getName();
}
TBaseCustomer customer=customerService.getById(Integer.valueOf(d.getCompanyId())); TBaseCustomer customer=customerService.getById(Integer.valueOf(d.getCompanyId()));
TBasePosition title=positionService.getById(d.getTitleId()); TBasePosition title=positionService.getById(d.getTitleId());
return new AppUserForAdminVO() return new AppUserForAdminVO()
@ -436,9 +418,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
.setUserState(d.getState()) .setUserState(d.getState())
.setPrimary(false) .setPrimary(false)
.setExpireTime(d.getExpireTime()) .setExpireTime(d.getExpireTime())
.setCreateBy(createUser.getName()) .setCreateBy(d.getCreateBy())
.setCreateTime(d.getCreateTime()) .setCreateTime(d.getCreateTime())
.setUpdateBy(updateBy) .setUpdateBy(d.getUpdateBy())
.setState(d.getExpireTime().isAfter(ChronoLocalDate.from(LocalDateTime.now())) ? 1 : 2) .setState(d.getExpireTime().isAfter(ChronoLocalDate.from(LocalDateTime.now())) ? 1 : 2)
.setLastLoginTime(d.getLastLoginTime()); .setLastLoginTime(d.getLastLoginTime());
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@ -485,7 +467,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
VUtils.trueThrowBusinessError(Objects.equals(appUser.getIsPrimary(), false)) VUtils.trueThrowBusinessError(Objects.equals(appUser.getIsPrimary(), false))
.throwMessage(id + "不是主账号"); .throwMessage(id + "不是主账号");
appUser.setExpireTime(appUser.getExpireTime().plusMonths(request.getMonth())); appUser.setExpireTime(appUser.getExpireTime().plusMonths(request.getMonth()));
// appUser.setUpdateBy(AdminUserUtil.getUserId()); appUser.setUpdateBy(AdminUserUtil.getUserName());
appUser.setUpdateTime(now); appUser.setUpdateTime(now);
updateById(appUser); updateById(appUser);
}); });

26
nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
View File

@ -3,12 +3,12 @@
<mapper namespace="com.nflg.mobilebroken.repository.mapper.AppUserMapper"> <mapper namespace="com.nflg.mobilebroken.repository.mapper.AppUserMapper">
<select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO"> <select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
SELECT u.id,c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar,a.`name` AS 'areaName',u.`state` AS 'userState',uc.`name` AS 'createBy',u.create_time AS 'createTime',uu.`name` AS 'updateBy',u.update_time AS 'updateTime',u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary',IF(u.expire_time>now(),1,2) AS 'state' SELECT u.id,c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar,a.`name` AS 'areaName',u.`state` AS 'userState'
,u.create_by AS 'createBy',u.create_time AS 'createTime',u.update_by AS 'updateBy',u.update_time AS 'updateTime'
,u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary',IF(u.expire_time>now(),1,2) AS 'state'
FROM app_user u FROM app_user u
INNER JOIN t_base_customer c ON u.company_id=c.id INNER JOIN t_base_customer c ON u.company_id=c.id
INNER JOIN app_area a ON u.area_id=a.id INNER JOIN app_area a ON u.area_id=a.id
LEFT JOIN app_user uc ON u.create_by=uc.id
LEFT JOIN app_user uu ON u.update_by=uu.id
WHERE u.is_del=0 AND u.is_primary=false AND u.company_id IN WHERE u.is_del=0 AND u.is_primary=false AND u.company_id IN
<foreach collection="request.companyIds" item="companyId" open="(" separator="," close=")"> <foreach collection="request.companyIds" item="companyId" open="(" separator="," close=")">
#{companyId} #{companyId}
@ -27,11 +27,12 @@
</if> </if>
</where> </where>
UNION UNION
SELECT u.id,c.agency_company_name AS 'companyName',u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar',a.`name` AS 'areaName',0 AS 'userState',uc.`name` AS 'createBy',u.create_time AS 'createTime',null AS 'updateBy',null AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime',false AS 'isPrimary',0 AS 'state' SELECT u.id,c.agency_company_name AS 'companyName',u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar'
,a.`name` AS 'areaName',0 AS 'userState',u.create_by AS 'createBy',u.create_time AS 'createTime',u.update_by AS 'updateBy'
,u.update_time AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime',false AS 'isPrimary',0 AS 'state'
FROM app_user_applyfor u FROM app_user_applyfor u
INNER JOIN t_base_customer c ON u.company_id=c.id INNER JOIN t_base_customer c ON u.company_id=c.id
INNER JOIN app_area a ON u.area_id=a.id INNER JOIN app_area a ON u.area_id=a.id
LEFT JOIN app_user uc ON u.create_by=uc.id
WHERE u.company_id IN WHERE u.company_id IN
<foreach collection="request.companyIds" item="companyId" open="(" separator="," close=")"> <foreach collection="request.companyIds" item="companyId" open="(" separator="," close=")">
#{companyId} #{companyId}
@ -39,30 +40,26 @@
</select> </select>
<select id="getInfo" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO"> <select id="getInfo" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
SELECT u.id,u.area_id AS 'areaId',c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar SELECT u.id,u.area_id AS 'areaId',c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar
,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',u.state AS 'userState',uc.`name` AS 'createBy' ,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',u.state AS 'userState',u.create_by AS 'createBy'
,u.create_time AS 'createTime',uu.`name` AS 'updateBy',u.update_time AS 'updateTime' ,u.create_time AS 'createTime',u.update_by AS 'updateBy',u.update_time AS 'updateTime'
,u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary' ,u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary'
,u.login_name AS 'loginName',u.phone ,u.login_name AS 'loginName',u.phone
FROM app_user u FROM app_user u
INNER JOIN t_base_customer c ON u.company_id = c.id INNER JOIN t_base_customer c ON u.company_id = c.id
LEFT JOIN t_base_area a1 ON u.area_id = a1.id LEFT JOIN t_base_area a1 ON u.area_id = a1.id
LEFT JOIN app_area a2 ON u.area_id = a2.id LEFT JOIN app_area a2 ON u.area_id = a2.id
LEFT JOIN app_user uc ON u.create_by = uc.id
LEFT JOIN app_user uu ON u.update_by = uu.id
WHERE u.id = #{userId} WHERE u.id = #{userId}
</select> </select>
<select id="searchByCompany" parameterType="com.nflg.mobilebroken.common.pojo.request.UserSearchRequest" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO"> <select id="searchByCompany" parameterType="com.nflg.mobilebroken.common.pojo.request.UserSearchRequest" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
SELECT u.id,u.phone,u.state AS 'userState',u.title_id AS 'titleId',u.area_id AS 'areaId',u.company_id AS 'companyId' SELECT u.id,u.phone,u.state AS 'userState',u.title_id AS 'titleId',u.area_id AS 'areaId',u.company_id AS 'companyId'
,p.position_name AS 'title',u.expire_time AS 'expireTime',c.agency_company_name AS 'companyName',u.login_name AS 'loginName' ,p.position_name AS 'title',u.expire_time AS 'expireTime',c.agency_company_name AS 'companyName',u.login_name AS 'loginName'
,u.`name`,u.email,u.avatar,a.`name` AS 'areaName',uc.`name` AS 'createBy',u.create_time AS 'createTime',uu.`name` AS 'updateBy' ,u.`name`,u.email,u.avatar,a.`name` AS 'areaName',u.create_by AS 'createBy',u.create_time AS 'createTime',u.update_by AS 'updateBy'
,u.update_time AS 'updateTime',u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary' ,u.update_time AS 'updateTime',u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary'
,IF(u.expire_time>now(),1,2) AS 'state',u.language_code AS 'languageCode' ,IF(u.expire_time>now(),1,2) AS 'state',u.language_code AS 'languageCode'
FROM app_user u FROM app_user u
INNER JOIN t_base_customer c ON u.company_id=c.id INNER JOIN t_base_customer c ON u.company_id=c.id
INNER JOIN app_area a ON u.area_id=a.id INNER JOIN app_area a ON u.area_id=a.id
LEFT JOIN app_user uc ON u.create_by=uc.id
LEFT JOIN app_user uu ON u.update_by=uu.id
LEFT JOIN t_base_position p ON u.title_id=p.id LEFT JOIN t_base_position p ON u.title_id=p.id
WHERE u.is_del=0 AND u.is_primary=false AND u.company_id=#{companyId} WHERE u.is_del=0 AND u.is_primary=false AND u.company_id=#{companyId}
<if test="state != null"> <if test="state != null">
@ -79,13 +76,12 @@
UNION UNION
SELECT u.id,u.user_phone AS 'phone',0 AS 'userState',u.title_id AS 'titleId',u.area_id AS 'areaId',u.company_id AS 'companyId' SELECT u.id,u.user_phone AS 'phone',0 AS 'userState',u.title_id AS 'titleId',u.area_id AS 'areaId',u.company_id AS 'companyId'
,p.position_name AS 'title',null AS 'expireTime',c.agency_company_name AS 'companyName',u.user_email AS 'loginName' ,p.position_name AS 'title',null AS 'expireTime',c.agency_company_name AS 'companyName',u.user_email AS 'loginName'
,u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar',a.`name` AS 'areaName',uc.`name` AS 'createBy' ,u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar',a.`name` AS 'areaName',u.create_by AS 'createBy'
,u.create_time AS 'createTime',null AS 'updateBy',null AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime' ,u.create_time AS 'createTime',u.update_by AS 'updateBy',null AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime'
,false AS 'isPrimary',0 AS 'state',u.language_code AS 'languageCode' ,false AS 'isPrimary',0 AS 'state',u.language_code AS 'languageCode'
FROM app_user_applyfor u FROM app_user_applyfor u
INNER JOIN t_base_customer c ON u.company_id=c.id INNER JOIN t_base_customer c ON u.company_id=c.id
INNER JOIN app_area a ON u.area_id=a.id INNER JOIN app_area a ON u.area_id=a.id
LEFT JOIN app_user uc ON u.create_by=uc.id
LEFT JOIN t_base_position p ON u.title_id=p.id LEFT JOIN t_base_position p ON u.title_id=p.id
WHERE u.state=0 AND u.company_id=#{companyId} WHERE u.state=0 AND u.company_id=#{companyId}
<if test="state > 0"> <if test="state > 0">

2
nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/service/SSEManagerBase.java
View File

@ -53,7 +53,7 @@ public class SSEManagerBase {
emitter.onCompletion(() -> { emitter.onCompletion(() -> {
emitters.remove(userId); emitters.remove(userId);
emitter.complete(); emitter.complete();
log.error("SSE超时:"+userId); log.error("SSE完成:"+userId);
}); });
SseEmitter.event().id(IdUtil.getIdStr()).name("connected").data("已连接").reconnectTime(5000); SseEmitter.event().id(IdUtil.getIdStr()).name("connected").data("已连接").reconnectTime(5000);
return emitter; return emitter;