最新版本

jiangping

2024-08-26 e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -98,8 +98,8 @@

    @Autowired
    private EmpowerMapper empowerMapper;

    @Autowired

    private DeviceMapper deviceMapper;

    @Autowired
@@ -152,7 +152,7 @@
                //创建系统登陆账号（默认无任何角色）
                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
                    //如果是内部组织人员，新增系统登陆账号
                    systemUserMapper.insert(createSystemUser(insert));
                    systemUserMapper.insert(createSystemUser(insert,systemDictDataBiz));
                    //处理培训有效期业务
                    dealTrainTIme(member,0,loginUserInfo);
                }
@@ -166,7 +166,7 @@
        }
        return insert;
    }
    private SystemUser createSystemUser(Member insert) {
    public static SystemUser createSystemUser(Member insert,SystemDictDataBiz systemDictDataBiz) {
        SystemUser user = new SystemUser();
        // 生成密码盐
        String salt = RandomStringUtils.randomAlphabetic(6);
@@ -186,6 +186,7 @@
        user.setUpdateUser(insert.getEditor());
        user.setUpdateTime(insert.getEditDate());
        user.setMemberId(insert.getId());
        user.setSource(Constants.ZERO);
        user.setDeleted(Boolean.FALSE);
        user.setFixed(Boolean.FALSE);
        user.setStatus(Constants.ZERO);
@@ -1108,7 +1109,9 @@
        if(StringUtils.isNotBlank(member.getName())){
            queryWrapper.like(Member::getName,member.getName());
        }

        if(Objects.nonNull(member.getCompanyType())){
            queryWrapper.eq(Company::getType,member.getCompanyType());
        }
        if(null != member.getType()) {
            queryWrapper.eq(Member::getType,member.getType());
        }
@@ -1587,7 +1590,7 @@
                .eq(Member::getType,Constants.memberType.internal)
                .eq(Member::getStatus,Constants.ZERO)
                .isNotNull(Member::getHkId)
                .apply("to_days(lastVisitDate)+ "+days+" < to_days(now())" ));
                .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" ));
        if(CollectionUtils.isEmpty(memberList)){
           return;
        }
@@ -1860,7 +1863,7 @@
                //创建系统登陆账号（默认无任何角色）
                if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
                    //如果是内部组织人员，新增系统登陆账号
                    userList.add(createSystemUser(insert));
                    userList.add(createSystemUser(insert,systemDictDataBiz));
                }
            }
            if(userList.size()>0){
@@ -2002,6 +2005,7 @@
        systemUser.setSalt(salt);
        systemUser.setPassword(member.getPassward());
        systemUser.setStatus(Constants.ZERO);
        systemUser.setSource(Constants.TWO);
        systemUserMapper.insert(systemUser);

    }