社区后台基础数据库bug修改

tangxiaobao

2021-07-20 af70e4d0660f1ce8c22d446743ff349dc66afeac

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1942,7 +1942,7 @@
            }

            //网格员关联楼栋
            if(!eventGridMemberAddDTO.getBuildingIds().isEmpty()){
            if(eventGridMemberAddDTO.getBuildingIds() != null && !eventGridMemberAddDTO.getBuildingIds().isEmpty()){
                List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
                eventGridMemberAddDTO.getBuildingIds().forEach(buildingId -> {
                    Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
@@ -2011,6 +2011,7 @@
     * @return  修改结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO){

        if(gridMemberDTO.getGridMemberId() == null){
@@ -2035,17 +2036,18 @@
        try {
            insert = userDao.updateById(sysUserDO);

            //清除原本关联网格员信息
            this.userDao.delLcMember(sysUserDO.getUserId());
            //关联市平台网格员
            if(gridMemberDTO.getLcMemberId() != null){
                //关联现有的网格员信息
                this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
            }else{
                this.userDao.delLcMember(sysUserDO.getUserId());
            }
            //清除原网格员与楼栋关联关系
            this.userDao.delGridMemberRelation(sysUserDO.getUserId());

            //新增网格员关联楼栋
            if(!gridMemberDTO.getBuildingIds().isEmpty()){
            if(gridMemberDTO.getBuildingIds() != null && !gridMemberDTO.getBuildingIds().isEmpty()){
                List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
                gridMemberDTO.getBuildingIds().forEach(buildingId -> {
                    Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
@@ -2160,4 +2162,14 @@
        });
        return R.ok(sysUserAgreementVOS);
    }

    @Override
    public R getGridIsOk(Long userId){
        Integer count = this.userDao.getGridIsOk(userId);
        if(count > 0){
            return R.ok(count);
        }else{
            return R.fail();
        }
    }
}