用户查询修改，只根据账号过滤

zhongrj

2024-04-16 0415473b4ba34d19b96c9f9491a7f01d1ebc813b

用户查询修改，只根据账号过滤

 src/main/java/org/springblade/es/service/ElasticsearchDocumentService.java

@@ -102,14 +102,24 @@
     * @return
     */
    public boolean init(EsParam esParam) {
        // 场所
        initPlace(esParam);
        // 通知文章
        initArticle(esParam);
        // 房屋
        initHouse(esParam);
        // 住户
        initHousehold(esParam);
        if (!Strings.isBlank(esParam.getTableName())) {
            if (esParam.getTableName().equals("jczz_place")) {
                // 场所
                initPlace(esParam);
            }
            if (esParam.getTableName().equals("jczz_article")) {
                // 通知文章
                initArticle(esParam);
            }
            if (esParam.getTableName().equals("jczz_house")) {
                // 房屋
                initHouse(esParam);
            }
            if (esParam.getTableName().equals("jczz_household")) {
                // 住户
                initHousehold(esParam);
            }
        }
        // 返回
        return true;
    }

 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml

@@ -608,6 +608,7 @@
        where 1=1
        and ja.is_deleted = 0
        and ja.publish = 1
        and ja.type = 0
        limit #{i},#{size}
    </select>

@@ -619,5 +620,6 @@
        where 1=1
        and ja.is_deleted = 0
        and ja.publish = 1
        and ja.type = 0
    </select>
</mapper>

 src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java

@@ -192,16 +192,9 @@
        User newUser = new User();
        if (null != householdEntity.getPhoneNumber() && !householdEntity.getPhoneNumber().equals("")) {
            //根据手机号查询库里的数据
            User userParams = new User();
            userParams.setPhone(householdEntity.getPhoneNumber());
            User user = userService.getOne(Condition.getQueryWrapper(userParams));
            if (null == user) {
                User userParams1 = new User();
                userParams1.setAccount(householdEntity.getPhoneNumber());
                userParams1.setIsDeleted(0);
                user = userService.getOne(Condition.getQueryWrapper(userParams1));
            }
            if (null != user) {
            List<User> list = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
            if (list.size()>0) {
                User user = list.get(0);
                //如果用户存在，则该用户id绑定场所
                householdEntity.setAssociatedUserId(user.getId());
                //更新住户信息
@@ -382,7 +375,7 @@
        // 查询该住户是否有账号
        IUserService userService1 = SpringUtils.getBean(IUserService.class);
        User user1 = userService1.getOne(Wrappers.<User>lambdaQuery()
            .eq(User::getPhone, householdEntity.getPhoneNumber())
            .eq(User::getAccount, householdEntity.getPhoneNumber())
            .eq(User::getIsDeleted, 0).last("limit 1"));
        if (user1 != null) {
            user = user1;

 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java

@@ -249,16 +249,9 @@
        User newUser = new User();
        if (null != householdEntity.getPhoneNumber() && !householdEntity.getPhoneNumber().equals("")) {
            //根据手机号查询库里的数据
            User userParams = new User();
            userParams.setPhone(householdEntity.getPhoneNumber());
            User user = userService.getOne(Condition.getQueryWrapper(userParams));
            if (null == user) {
                User userParams1 = new User();
                userParams1.setAccount(householdEntity.getPhoneNumber());
                userParams1.setIsDeleted(0);
                user = userService.getOne(Condition.getQueryWrapper(userParams1));
            }
            if (null != user) {
            List<User> list = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
            if (list.size()>0) {
                User user = list.get(0);
                //如果用户存在，则该用户id绑定场所
                householdEntity.setAssociatedUserId(user.getId());
                //更新住户信息

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -724,18 +724,9 @@
            placeVO.setPrincipal(placeVO.getPrincipal());
            placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
            //根据手机号查询库里的数据
            User userParams = new User();
            userParams.setPhone(placeVO.getPrincipalPhone());
            userParams.setIsDeleted(0);
            User user = userService.getOne(Condition.getQueryWrapper(userParams));
            if (null == user) {
                User userParams1 = new User();
                userParams1.setAccount(placeVO.getPrincipalPhone());
                userParams1.setIsDeleted(0);
                user = userService.getOne(Condition.getQueryWrapper(userParams1));
            }

            if (null != user) {
            List<User> list = userService.getUserListByPhoneOrAccount(placeVO.getPrincipalPhone());
            if (list.size()>0) {
                User user = list.get(0);
                //如果用户存在，则该用户id绑定场所
                placeVO.setPrincipalUserId(user.getId());
                newUser = user;

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -133,7 +133,7 @@
    <!--根据手机号查询对应账号和手机号的用户信息-->
    <select id="getUserListByPhoneOrAccount" resultType="org.springblade.modules.system.entity.User">
        SELECT * FROM blade_user where is_deleted = 0
        and (account = #{phoneNumber} or phone = #{phoneNumber})
        and account = #{phoneNumber}
    </select>

    <!--用户详情map-->